Merge branch 'hv/autosquash-config'
* hv/autosquash-config: add configuration variable for --autosquash option of interactive rebase
This commit is contained in:
@ -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") ||
|
||||
|
Reference in New Issue
Block a user