From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Quentin Nerden via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Quentin Nerden <quentin.nerden@gmail.com>
Subject: Re: [PATCH 1/1] docs: update git-clone doc: refer to long options
Date: Fri, 28 Jun 2019 13:55:29 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1906281352230.44@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqmui2aiwk.fsf@gitster-ct.c.googlers.com>
Hi,
On Thu, 27 Jun 2019, Junio C Hamano wrote:
> "Quentin Nerden via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > From: Quentin Nerden <quentin.nerden@gmail.com>
> >
> > To make the doc of git-clone easier to read,
> > refer to the long version of the options
> > (it is easier to guess what --verbose is doing than -v).
> >
> > Also:
> > put the short options first, to match the doc of git-add, git-commit, git-clean, git-branch...
>
> This "also" makes the patch unnecessarily harder to review.
> Splitting it into two patches would make it reviewable.
Good idea.
The easiest way I can think of would be to split by first undoing the
commit via `git reset --hard HEAD^` (don't worry, the commit graph is
still accessible via the reflog), then staging the parts of the patch that
put the short options first: `git checkout -p HEAD@{1}`. After that is
done, commit with a new commit message, then get the remainder of the
changes via `git cherry-pick HEAD@{2}` (by now, the original commit is no
longer `HEAD@{1}` because a new commit has been appended to the reflog).
Then force-push and submit a new iteration ;-)
Ciao,
Johannes
next prev parent reply other threads:[~2019-06-28 11:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-27 19:16 [PATCH 0/1] Update git-clone doc: refer to long option Quentin Nerden via GitGitGadget
2019-06-27 19:17 ` [PATCH 1/1] docs: update git-clone doc: refer to long options Quentin Nerden via GitGitGadget
2019-06-27 20:10 ` Junio C Hamano
2019-06-28 11:55 ` Johannes Schindelin [this message]
2019-07-02 14:37 ` [PATCH v2 0/2] Update git-clone doc: refer to long form of the options and list short form of the options first Quentin Nerden via GitGitGadget
2019-07-02 14:37 ` [PATCH v2 1/2] docs: git-clone: refer to long form of options Quentin Nerden via GitGitGadget
2019-07-02 14:37 ` [PATCH v2 2/2] docs: git-clone: list short form of options first Quentin Nerden via GitGitGadget
2019-07-02 19:14 ` Junio C Hamano
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=nycvar.QRO.7.76.6.1906281352230.44@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=quentin.nerden@gmail.com \
/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).