Merge branch 'hv/autosquash-config'

* hv/autosquash-config:
  add configuration variable for --autosquash option of interactive rebase
This commit is contained in:
Junio C Hamano
2010-08-31 16:15:03 -07:00
4 changed files with 47 additions and 8 deletions

View File

@ -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") ||