Re: [PATCH v4 9/9] doc/git-rebase: add documentation for fixup [-C|-c] options

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 2021-02-01 10:23 p.m., Eric Sunshine wrote:
On 1/29/21 1:20 PM, Charvi Mendiratta wrote:
Signed-off-by: Charvi Mendiratta <charvi077@xxxxxxxxx>
---
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
@@ -887,9 +887,17 @@ If you want to fold two or more commits into one, replace the command
  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.
+message for the folded commit is the concatenation of the first
+commit's message with those identified by "squash" commands, omitting the
+messages of commits identified by "fixup" commands, unless "fixup -c"
+is used.  In that case the suggested commit message is only the message
+of the "fixup -c" commit, and an editor is opened allowing you to edit
+the message.  The contents (patch) of the "fixup -c" commit are still
+incorporated into the folded commit. If there is more than one "fixup -c"
+commit, the message from the last last one is used.  You can also use

Erm, s/last last/last/ or even better s/last last/final/

I like "final", personally.

		M.

+"fixup -C" to get the same behavior as "fixup -c" except without opening
+an editor.
+
  '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

It seems like an extra blank line sneaked in between the updated paragraph and the paragraph which follows it.



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux