git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

Previous: Phillip WoodNext: Junio C Hamano
Message 5 of 10 in “rebase: document --rerere-autoupdate”
  1. 1/4 rebase: document --rerere-autoupdatePhillip Wood, Mar 13, 2019
  2. 2/4 cherry-pick/revert: document --rerere-autoupdatePhillip Wood, Mar 13, 2019
  3. 3/4 am: document --rerere-autoupdatePhillip Wood, Mar 13, 2019
  4. 4/4 merge: tweak --rerere-autoupdate documentationPhillip Wood, Mar 13, 2019
  5. Johannes SchindelinMar 13, 2019
  6. Junio C HamanoMar 14, 2019
  7. am/cherry-pick/rebase/revert: document --rerere-autoupdatePhillip Wood, Mar 14, 2019
  8. 1/2 am/cherry-pick/rebase/revert: document --rerere-autoupdatePhillip Wood, Mar 14, 2019
  9. 2/2 merge: tweak --rerere-autoupdate documentationPhillip Wood, Mar 14, 2019
  10. Junio C HamanoMar 18, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.