diff options
| author |  Heiko Voigt <hvoigt@hvoigt.net> | 2010-07-14 13:59:57 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-14 08:47:29 -0700 |
| commit | dd1e5b313a0aef5d22cd9909c14e4b1b6dcbea79 (patch) | |
| tree | 6689ef65a903c6ba9e4e765ee9135c5902cbf7d6 /git-rebase--interactive.sh | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-dd1e5b313a0aef5d22cd9909c14e4b1b6dcbea79.tar.xz | |
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 <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 4 |
1 files changed, 4 insertions, 0 deletions
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") || |