Re: [PATCH 4/4] merge: tweak --rerere-autoupdate documentation
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 13, 2019, 22:57 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1903132357070.41@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20190313182756.8076-4-phillip.wood123@gmail.com>
Hi Phillip,
On Wed, 13 Mar 2019, Phillip Wood wrote:
Show 23 quoted lines
> From: Phillip Wood <phillip.wood@dunelm.org.uk> > > Spell out --no-rerere-autoupdate explictly to make searching > easier. This matches the other --no options in the man page. > > Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> > --- > Documentation/git-merge.txt | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt > index 4cc86469f3..6294dbc09d 100644 > --- a/Documentation/git-merge.txt > +++ b/Documentation/git-merge.txt > @@ -83,7 +83,8 @@ invocations. The automated message can include the branch description. > If `--log` is specified, a shortlog of the commits being merged > will be appended to the specified message. > > ---[no-]rerere-autoupdate:: > +--rerere-autoupdate:: > +--no-rerere-autoupdate:: > Allow the rerere mechanism to update the index with the > result of auto-conflict resolution if possible.
All four patches make sense to me.
Thanks, Dscho