diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:41:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:41:48 -0800 |
| commit | cc6b41cc7d38c1b2de9809c0995087a2378d27ec (patch) | |
| tree | a0192c7abe36de838db16737fdf7972007d8d776 /Documentation | |
| parent | Merge branch 'il/push-set-upstream' (diff) | |
| parent | rebase-i: Ignore comments and blank lines in peek_next_command (diff) | |
| download | tgif-cc6b41cc7d38c1b2de9809c0995087a2378d27ec.tar.xz | |
Merge branch 'mh/rebase-fixup' (early part)
* 'mh/rebase-fixup' (early part):
rebase-i: Ignore comments and blank lines in peek_next_command
lib-rebase: Allow comments and blank lines to be added to the rebase script
lib-rebase: Provide clearer debugging info about what the editor did
Add a command "fixup" to rebase --interactive
t3404: Use test_commit to set up test repository
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index ca5e1e8653..9b648ece6e 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -382,9 +382,12 @@ If you just want to edit the commit message for a commit, replace the command "pick" with the command "reword". If you want to fold two or more commits into one, replace the command -"pick" with "squash" for the second and subsequent commit. If the -commits had different authors, it will attribute the squashed commit to -the author of the first commit. +"pick" for the second and subsequent commits with "squash" or "fixup". +If the commits had different authors, the folded commit will be +attributed to the author of the first commit. The suggested commit +message for the folded commit is the concatenation of the commit +messages of the first commit and of those with the "squash" command, +but omits the commit messages of commits with the "fixup" command. 'git-rebase' will stop when "pick" has been replaced with "edit" or when a command fails due to merge errors. When you are done editing @@ -512,8 +515,8 @@ Easy case: The changes are literally the same.:: Hard case: The changes are not the same.:: This happens if the 'subsystem' rebase had conflicts, or used - `\--interactive` to omit, edit, or squash commits; or if the - upstream used one of `commit \--amend`, `reset`, or + `\--interactive` to omit, edit, squash, or fixup commits; or + if the upstream used one of `commit \--amend`, `reset`, or `filter-branch`. |