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 /Documentation | |
| parent | Merge branch 'sg/rerere-gc-old-still-used' (diff) | |
| parent | add configuration variable for --autosquash option of interactive rebase (diff) | |
| download | tgif-a621859101370205d89a6fea7ba17839a43eb4ab.tar.xz | |
Merge branch 'hv/autosquash-config'
* hv/autosquash-config:
add configuration variable for --autosquash option of interactive rebase
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-rebase.txt | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 05ec3fed89..19b6dc6dda 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1549,6 +1549,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. + receive.autogc:: By default, git-receive-pack will run "git-gc --auto" after receiving data from git-push and updating refs. You can stop diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 3b87f1a1b6..45c52d2e57 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>:: @@ -333,6 +336,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 @@ -341,6 +345,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 |