From dd1e5b313a0aef5d22cd9909c14e4b1b6dcbea79 Mon Sep 17 00:00:00 2001 From: Heiko Voigt Date: Wed, 14 Jul 2010 13:59:57 +0200 Subject: add configuration variable for --autosquash option of interactive rebase If you use this feature regularly you can now enable it by default. In case the user wants to override this config on the commandline --no-autosquash can be used to force disabling. Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'git-rebase--interactive.sh') diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 6b86abc64b..7b35f80818 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -111,6 +111,7 @@ VERBOSE= OK_TO_SKIP_PRE_REBASE= REBASE_ROOT= AUTOSQUASH= +test "$(git config --bool rebase.autosquash)" = "true" && AUTOSQUASH=t NEVER_FF= GIT_CHERRY_PICK_HELP=" After resolving the conflicts, @@ -795,6 +796,9 @@ first and then run 'git rebase --continue' again." --autosquash) AUTOSQUASH=t ;; + --no-autosquash) + AUTOSQUASH= + ;; --onto) shift ONTO=$(parse_onto "$1") || -- cgit v1.3