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 /Documentation/git-rebase.txt | |
| parent | 449aeb10d5d28083199f82c444b55a03c545e956 (diff) | |
| download | git-dd1e5b313a0aef5d22cd9909c14e4b1b6dcbea79.tar.gz | |
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 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index be23ad2359..911b1380f3 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -199,6 +199,9 @@ rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. +rebase.autosquash:: + If set to true enable '--autosquash' option by default. + OPTIONS ------- <newbase>:: @@ -326,6 +329,7 @@ idea unless you know what you are doing (see BUGS below). instead. --autosquash:: +--no-autosquash:: When the commit log message begins with "squash! ..." (or "fixup! ..."), and there is a commit whose title begins with the same ..., automatically modify the todo list of rebase -i @@ -334,6 +338,10 @@ idea unless you know what you are doing (see BUGS below). commit from `pick` to `squash` (or `fixup`). + This option is only valid when the '--interactive' option is used. ++ +If the '--autosquash' option is enabled by default using the +configuration variable `rebase.autosquash`, this option can be +used to override and disable this setting. --no-ff:: With --interactive, cherry-pick all rebased commits instead of |