diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:15:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:15:03 -0700 |
| commit | a621859101370205d89a6fea7ba17839a43eb4ab (patch) | |
| tree | 5b765708864a2e0ab0bf79c216e2e58c5fbe6029 /git-rebase--interactive.sh | |
| parent | e24058f57f4e76e38e20390c5927590f3cd48085 (diff) | |
| parent | dd1e5b313a0aef5d22cd9909c14e4b1b6dcbea79 (diff) | |
| download | git-a621859101370205d89a6fea7ba17839a43eb4ab.tar.gz | |
Merge branch 'hv/autosquash-config'
* hv/autosquash-config:
add configuration variable for --autosquash option of interactive rebase
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 3419247d03..4d14b077d2 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, @@ -831,6 +832,9 @@ first and then run 'git rebase --continue' again." --autosquash) AUTOSQUASH=t ;; + --no-autosquash) + AUTOSQUASH= + ;; --onto) shift ONTO=$(parse_onto "$1") || |