From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 28 Jun 2019 11:55:29 GMT
Subject: Re: [PATCH 1/1] docs: update git-clone doc: refer to long options
Message-ID: <nycvar.QRO.7.76.6.1906281352230.44@tvgsbejvaqbjf.bet>
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