Re: [PATCH v4 6/6] doc/git-commit: add documentation for fixup=[amend|reword] options

2 messages, 2 authors, 2021-03-11 · open the first message on its own page

Re: [PATCH v4 6/6] doc/git-commit: add documentation for fixup=[amend|reword] options

From: Junio C Hamano <hidden>
Date: 2021-03-11 00:31:54

Charvi Mendiratta [off-list ref] writes:
---fixup=<commit>::
-	Construct a commit message for use with `rebase --autosquash`.
-	The commit message will be the subject line from the specified
-	commit with a prefix of "fixup! ".  See linkgit:git-rebase[1]
-	for details.
Overall, the text in this round reads much better than the previous
round.
quoted hunk
+--fixup=[(amend|reword):]<commit>::
+	Construct a new commit for use with `rebase --autosquash`,
+	which fixes the specified commit. The plain form
+	`--fixup=<commit>` creates a "fixup!" commit, that allows
+	to fixup only the content of the specified commit and leave
+	it's commit log message untouched. When used with `amend:`
+	or `reword:`, it creates "amend!" commit that is like "fixup!"
+	commit but it allows to fixup both the content and the commit
+	log message of the specified commit. The commit log message of
+	the specified commit is fixed implicitly by replacing it with
+	the "amend!" commit's message body upon `rebase --autosquash`.
Rewriting

    "is fixed implicitly by replacing it with" -> "is replaced by"

may make it easier to follow.

Thanks.

Re: [PATCH v4 6/6] doc/git-commit: add documentation for fixup=[amend|reword] options

From: Charvi Mendiratta <hidden>
Date: 2021-03-11 04:03:26

On Thu, 11 Mar 2021 at 06:01, Junio C Hamano [off-list ref] wrote:
quoted
+--fixup=[(amend|reword):]<commit>::
+     Construct a new commit for use with `rebase --autosquash`,
+     which fixes the specified commit. The plain form
+     `--fixup=<commit>` creates a "fixup!" commit, that allows
+     to fixup only the content of the specified commit and leave
+     it's commit log message untouched. When used with `amend:`
+     or `reword:`, it creates "amend!" commit that is like "fixup!"
+     commit but it allows to fixup both the content and the commit
+     log message of the specified commit. The commit log message of
+     the specified commit is fixed implicitly by replacing it with
+     the "amend!" commit's message body upon `rebase --autosquash`.
Rewriting

    "is fixed implicitly by replacing it with" -> "is replaced by"

may make it easier to follow.
Okay I will replace it.

Thanks and Regards,
Charvi
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help