From f725a4e354219db5f46ec6f5f4a7c3c4fe275a31 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Wed, 10 Jul 2024 19:56:21 +0530
Subject: [PATCH] fish: conf.d/git-abbr: Use no recurse submodules option for
 reset

Since we set submodule.recurse = true by default, calling reset
will automatically result in --recurse-submodules being passed
as true to git reset which is not what we want.

Also see,
https://git-scm.com/docs/git-config#Documentation/git-config.txt-submodulerecurse
---
 fish/.config/fish/conf.d/git-abbr.fish | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fish/.config/fish/conf.d/git-abbr.fish b/fish/.config/fish/conf.d/git-abbr.fish
index 0373375..6ba088a 100644
--- a/fish/.config/fish/conf.d/git-abbr.fish
+++ b/fish/.config/fish/conf.d/git-abbr.fish
@@ -109,12 +109,12 @@ abbr grbi      'git rebase -i'
 abbr grbo      'git rebase --onto'
 abbr grbs      'git rebase --skip'
 abbr grev      'git revert'
-abbr grs       'git reset'
-abbr grs!      'git reset --hard'
-abbr grsh      'git reset HEAD'
-abbr grsh!     'git reset HEAD --hard'
-abbr gpristine 'git reset --hard && git clean -dffx'
-abbr grs-      'git reset --'
+abbr grs       'git reset --no-recurse-submodules'
+abbr grs!      'git reset --no-recurse-submodules --hard'
+abbr grsh      'git reset --no-recurse-submodules HEAD'
+abbr grsh!     'git reset --no-recurse-submodules HEAD --hard'
+abbr gpristine 'git reset --no-recurse-submodules --hard && git clean -dffx'
+abbr grs-      'git reset --no-recurse-submodules --'
 abbr grm       'git rm'
 abbr grmc      'git rm --cached'
 abbr grst      'git restore'