All of lore.kernel.org
 help / color / mirror / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH 4/4] merge: tweak --rerere-autoupdate documentation
Date: Wed, 13 Mar 2019 18:27:56 +0000	[thread overview]
Message-ID: <20190313182756.8076-4-phillip.wood123@gmail.com> (raw)
In-Reply-To: <20190313182756.8076-1-phillip.wood123@gmail.com>

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.
 
-- 
2.21.0


  parent reply	other threads:[~2019-03-13 18:28 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-13 18:27 [PATCH 1/4] rebase: document --rerere-autoupdate Phillip Wood
2019-03-13 18:27 ` [PATCH 2/4] cherry-pick/revert: " Phillip Wood
2019-03-13 18:27 ` [PATCH 3/4] am: " Phillip Wood
2019-03-13 18:27 ` Phillip Wood [this message]
2019-03-13 22:57   ` [PATCH 4/4] merge: tweak --rerere-autoupdate documentation Johannes Schindelin
2019-03-14  5:05 ` [PATCH 1/4] rebase: document --rerere-autoupdate Junio C Hamano
2019-03-14 19:12   ` am/cherry-pick/rebase/revert: " Phillip Wood
2019-03-14 19:12     ` [PATCH v2 1/2] " Phillip Wood
2019-03-14 19:12     ` [PATCH v2 2/2] merge: tweak --rerere-autoupdate documentation Phillip Wood
2019-03-18  1:25     ` am/cherry-pick/rebase/revert: document --rerere-autoupdate 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190313182756.8076-4-phillip.wood123@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.