From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 01 Mar 2021 18:44:30 GMT
Subject: Re: [PATCH v3 6/6] doc/git-commit: add documentation for fixup=[amend|reword] options
Message-ID: <xmqqczwir9wx.fsf@gitster.c.googlers.com>
In-Reply-To: <20210301084512.27170-7-charvi077@gmail.com>

Charvi Mendiratta <charvi077@gmail.com> writes:

> +--fixup=[(amend|reword):]<commit>::
> +	Without `amend:` or `reword:`, create a `fixup!` commit where
> +	the commit message will be the subject line from the specified
> +	commit with a prefix of "fixup!'". The resulting "fixup!" commit

What's the single quote in "fixup!'"???  We also have an "amend!'"
below.

> +	is further used with `git rebase --autosquash` to fixup the
> +	content of the specified commit.
> ++
> +The `--fixup=amend:<commit>` form creates an "amend!" commit to
> +fixup both the content and the commit log message of the specified
> +commit. The resulting "amend!" commit's commit message subject
> +will be the subject line from the specified commit with a prefix of
> +"amend!'" and the message body will be commit log message of the
> +specified commit. It also invokes an editor seeded with the log
> ...
> +The `--fixup=amend:` and `--fixup=reword:` forms cannot be used with
> +other options to add to the commit log message i.e it is incompatible

"i.e."

> +with `-m`/`-F`/`-c`/`-C` options.
> ++