diff mbox series

[1/4] rebase: document --rerere-autoupdate

Message ID 20190313182756.8076-1-phillip.wood123@gmail.com (mailing list archive)
State New, archived
Headers show
Series [1/4] rebase: document --rerere-autoupdate | expand

Commit Message

Phillip Wood March 13, 2019, 6:27 p.m. UTC 
From: Phillip Wood <phillip.wood@dunelm.org.uk>

This option was missing from the man page.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
 Documentation/git-rebase.txt | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Junio C Hamano March 14, 2019, 5:05 a.m. UTC | #1 
Phillip Wood <phillip.wood123@gmail.com> writes:

> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> This option was missing from the man page.
>
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> ---

Looks good, but I do not see what the point is to have 1-3 as three
separate patches.  It does make sense to have 4/4 as a separate
step, though.
Phillip Wood March 14, 2019, 7:12 p.m. UTC | #2 
I've squashed the first tree patches together

Best Wishes

Phillip
Junio C Hamano March 18, 2019, 1:25 a.m. UTC | #3 
Phillip Wood <phillip.wood123@gmail.com> writes:

> I've squashed the first tree patches together

Thanks.  The result of the series has no changes and that is good.
diff mbox series

Patch

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 5629ba4c5d..fbf9a4d70a 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -300,6 +300,11 @@  See also INCOMPATIBLE OPTIONS below.
 +
 See also INCOMPATIBLE OPTIONS below.
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
+
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
 	GPG-sign commits. The `keyid` argument is optional and