From: Charvi Mendiratta <charvi077@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git <git@vger.kernel.org>,
Christian Couder <christian.couder@gmail.com>,
Phillip Wood <phillip.wood123@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH 6/6] doc/git-commit: add documentation for fixup[amend|reword] options
Date: Fri, 19 Feb 2021 11:39:42 +0530 [thread overview]
Message-ID: <CAPSFM5dEEdXwgtfz==6e_745N93kWNT4tgxRGMBmz4BPynGXKQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqlfblfae2.fsf@gitster.g>
On Fri, 19 Feb 2021 at 00:53, Junio C Hamano <gitster@pobox.com> wrote:
[...]
> > +
> > + When used with alternative option `reword`, let's say
> > + `git commit --fixup=reword:<commit>`, it works similar to `amend`
> > + option, but here it creates an empty "amend!" commit, i.e it does
> > + not take any staged changes and only allows to fixup the commit
> > + message of the specified commit. It will reword the specified
> > + commit when it is rebased with `--autosquash`.
> > +
> > + `--fixup`, with or without option, can be used with additional
> > + commit message option `-m` but not with `-F`/`-c`/`-C`. See
> > + linkgit:git-rebase[1] for details.
>
> You must dedent the second and the subsequent paragraphs and replace
> each of these blank lines that mark inter-paragraph breaks with a
> line with a single plus '+' sign on it. See how "is mutually
> exclusive" explanation is appended to the description of "-m" as its
> second paragraph.
>
> Side note. It probably needs "exclusive -> incompatible".
>
> The description in git-rebase.txt you touched is another good
> example. Mimic the way its second paragraph "If the autosquash is
> enabled..." is formatted.
>
Got it. Thanks for pointing this out, I will correct it.
next prev parent reply other threads:[~2021-02-19 6:17 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 7:29 [PATCH 0/6][Outreachy] commit: Implementation of "amend!" commit Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 1/6] sequencer: export subject_length() Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 2/6] commit: add amend suboption to --fixup to create amend! commit Charvi Mendiratta
2021-02-17 19:49 ` Junio C Hamano
2021-02-18 10:13 ` Charvi Mendiratta
2021-02-18 19:18 ` Junio C Hamano
2021-02-18 20:37 ` Junio C Hamano
2021-02-19 6:10 ` Charvi Mendiratta
2021-02-19 6:09 ` Charvi Mendiratta
2021-02-20 3:15 ` Junio C Hamano
2021-02-21 6:35 ` Charvi Mendiratta
2021-02-21 7:05 ` Junio C Hamano
2021-02-21 9:20 ` Charvi Mendiratta
2021-02-22 17:35 ` Junio C Hamano
2021-02-23 6:05 ` Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 3/6] commit: add a reword suboption to --fixup Charvi Mendiratta
2021-02-17 19:56 ` Junio C Hamano
2021-02-18 10:14 ` Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 4/6] t7500: add tests for --fixup[amend|reword] options Charvi Mendiratta
2021-02-17 19:59 ` Junio C Hamano
2021-02-18 10:15 ` Charvi Mendiratta
2021-02-18 19:26 ` Junio C Hamano
2021-02-19 6:10 ` Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 5/6] t3437: use --fixup with options to create amend! commit Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 6/6] doc/git-commit: add documentation for fixup[amend|reword] options Charvi Mendiratta
2021-02-18 19:23 ` Junio C Hamano
2021-02-19 6:09 ` Charvi Mendiratta [this message]
2021-02-23 19:55 ` [PATCH 0/6][Outreachy] commit: Implementation of "amend!" commit Junio C Hamano
2021-02-24 5:54 ` Charvi Mendiratta
2021-02-25 10:08 ` [PATCH v2 " Charvi Mendiratta
2021-02-25 10:08 ` [PATCH v2 1/6] sequencer: export subject_length() Charvi Mendiratta
2021-02-25 10:08 ` [PATCH v2 2/6] commit: add amend suboption to --fixup to create amend! commit Charvi Mendiratta
2021-02-25 21:00 ` Junio C Hamano
2021-02-26 10:38 ` Charvi Mendiratta
2021-02-26 19:32 ` Junio C Hamano
2021-02-27 4:56 ` Charvi Mendiratta
2021-02-25 10:08 ` [PATCH v2 3/6] commit: add a reword suboption to --fixup Charvi Mendiratta
2021-02-25 20:32 ` Junio C Hamano
2021-02-26 10:35 ` Charvi Mendiratta
2021-02-25 10:09 ` [PATCH v2 4/6] t7500: add tests for --fixup=[amend|reword] options Charvi Mendiratta
2021-02-25 10:09 ` [PATCH v2 5/6] t3437: use --fixup with options to create amend! commit Charvi Mendiratta
2021-02-25 10:09 ` [PATCH v2 6/6] doc/git-commit: add documentation for fixup=[amend|reword] options Charvi Mendiratta
2021-02-25 20:48 ` Junio C Hamano
2021-02-26 10:36 ` Charvi Mendiratta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPSFM5dEEdXwgtfz==6e_745N93kWNT4tgxRGMBmz4BPynGXKQ@mail.gmail.com' \
--to=charvi077@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).