diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 22:42:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 22:42:04 (GMT) |
| commit | cea20f24738c558d56483402db1ddfebd0362ee4 (patch) | |
| tree | 2d5010857dd1d87b4b5735dea3d423acb68836fb /Documentation | |
| parent | cc6b41cc7d38c1b2de9809c0995087a2378d27ec (diff) | |
| parent | f59baa502f49c3f1579a82bc37d2bb3ce9e7b5da (diff) | |
| download | git-cea20f24738c558d56483402db1ddfebd0362ee4.zip git-cea20f24738c558d56483402db1ddfebd0362ee4.tar.gz git-cea20f24738c558d56483402db1ddfebd0362ee4.tar.bz2 | |
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.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 9b648ec..e2e61d3 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 |