File tree Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -887,9 +887,17 @@ If you want to fold two or more commits into one, replace the command
887
887
"pick" for the second and subsequent commits with "squash" or "fixup".
888
888
If the commits had different authors, the folded commit will be
889
889
attributed to the author of the first commit. The suggested commit
890
- message for the folded commit is the concatenation of the commit
891
- messages of the first commit and of those with the "squash" command,
892
- but omits the commit messages of commits with the "fixup" command.
890
+ message for the folded commit is the concatenation of the first
891
+ commit's message with those identified by "squash" commands, omitting the
892
+ messages of commits identified by "fixup" commands, unless "fixup -c"
893
+ is used. In that case the suggested commit message is only the message
894
+ of the "fixup -c" commit, and an editor is opened allowing you to edit
895
+ the message. The contents (patch) of the "fixup -c" commit are still
896
+ incorporated into the folded commit. If there is more than one "fixup -c"
897
+ commit, the message from the last last one is used. You can also use
898
+ "fixup -C" to get the same behavior as "fixup -c" except without opening
899
+ an editor.
900
+
893
901
894
902
'git rebase' will stop when "pick" has been replaced with "edit" or
895
903
when a command fails due to merge errors. When you are done editing
You can’t perform that action at this time.
0 commit comments