summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 14:42:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 14:42:04 -0800
commitcea20f24738c558d56483402db1ddfebd0362ee4 (patch)
tree2d5010857dd1d87b4b5735dea3d423acb68836fb /Documentation
parentMerge branch 'mh/rebase-fixup' (early part) (diff)
parentrebase -i --autosquash: auto-squash commits (diff)
downloadtgif-cea20f24738c558d56483402db1ddfebd0362ee4.tar.xz
Merge branch 'ns/rebase-auto-squash'
* ns/rebase-auto-squash: rebase -i --autosquash: auto-squash commits Conflicts: git-rebase--interactive.sh
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rebase.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 9b648ece6e..e2e61d3642 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -308,6 +308,16 @@ which makes little sense.
root commits will be rewritten to have <newbase> as parent
instead.
+--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
+ so that the commit marked for quashing come right after the
+ commit to be modified, and change the action of the moved
+ commit from `pick` to `squash` (or `fixup`).
++
+This option is only valid when '--interactive' option is used.
+
include::merge-strategies.txt[]
NOTES