git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH 1/4] rebase: document --rerere-autoupdate
@ 2019-03-13 18:27 Phillip Wood
  2019-03-13 18:27 ` [PATCH 2/4] cherry-pick/revert: " Phillip Wood
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Phillip Wood @ 2019-03-13 18:27 UTC (permalink / raw)
  To: Git Mailing List; +Cc: Junio C Hamano, Phillip Wood

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(+)

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


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 2/4] cherry-pick/revert: document --rerere-autoupdate
  2019-03-13 18:27 [PATCH 1/4] rebase: document --rerere-autoupdate Phillip Wood
@ 2019-03-13 18:27 ` Phillip Wood
  2019-03-13 18:27 ` [PATCH 3/4] am: " Phillip Wood
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 10+ messages in thread
From: Phillip Wood @ 2019-03-13 18:27 UTC (permalink / raw)
  To: Git Mailing List; +Cc: Junio C Hamano, Phillip Wood

From: Phillip Wood <phillip.wood@dunelm.org.uk>

This option was missing from the man pages.
---
 Documentation/git-cherry-pick.txt | 5 +++++
 Documentation/git-revert.txt      | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index b8cfeec67e..d64e72462f 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -148,6 +148,11 @@ effect to your index in a row.
 	Pass the merge strategy-specific option through to the
 	merge strategy.  See linkgit:git-merge[1] for details.
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
+
 SEQUENCER SUBCOMMANDS
 ---------------------
 include::sequencer.txt[]
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 837707a8fd..6afccb2f1e 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -101,6 +101,11 @@ effect to your index in a row.
 	Pass the merge strategy-specific option through to the
 	merge strategy.  See linkgit:git-merge[1] for details.
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
+
 SEQUENCER SUBCOMMANDS
 ---------------------
 include::sequencer.txt[]
-- 
2.21.0


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 3/4] am: document --rerere-autoupdate
  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 ` Phillip Wood
  2019-03-13 18:27 ` [PATCH 4/4] merge: tweak --rerere-autoupdate documentation Phillip Wood
  2019-03-14  5:05 ` [PATCH 1/4] rebase: document --rerere-autoupdate Junio C Hamano
  3 siblings, 0 replies; 10+ messages in thread
From: Phillip Wood @ 2019-03-13 18:27 UTC (permalink / raw)
  To: Git Mailing List; +Cc: Junio C Hamano, Phillip Wood

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-am.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 6f6c34b0f4..fc3b993c33 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -99,6 +99,11 @@ default.   You can use `--no-utf8` to override this.
 	am.threeWay configuration variable. For more information,
 	see am.threeWay in linkgit:git-config[1].
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
+
 --ignore-space-change::
 --ignore-whitespace::
 --whitespace=<option>::
-- 
2.21.0


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 4/4] merge: tweak --rerere-autoupdate documentation
  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
  2019-03-13 22:57   ` Johannes Schindelin
  2019-03-14  5:05 ` [PATCH 1/4] rebase: document --rerere-autoupdate Junio C Hamano
  3 siblings, 1 reply; 10+ messages in thread
From: Phillip Wood @ 2019-03-13 18:27 UTC (permalink / raw)
  To: Git Mailing List; +Cc: Junio C Hamano, Phillip Wood

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


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 4/4] merge: tweak --rerere-autoupdate documentation
  2019-03-13 18:27 ` [PATCH 4/4] merge: tweak --rerere-autoupdate documentation Phillip Wood
@ 2019-03-13 22:57   ` Johannes Schindelin
  0 siblings, 0 replies; 10+ messages in thread
From: Johannes Schindelin @ 2019-03-13 22:57 UTC (permalink / raw)
  To: Phillip Wood; +Cc: Git Mailing List, Junio C Hamano

Hi Phillip,

On Wed, 13 Mar 2019, Phillip Wood wrote:

> 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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/4] rebase: document --rerere-autoupdate
  2019-03-13 18:27 [PATCH 1/4] rebase: document --rerere-autoupdate Phillip Wood
                   ` (2 preceding siblings ...)
  2019-03-13 18:27 ` [PATCH 4/4] merge: tweak --rerere-autoupdate documentation Phillip Wood
@ 2019-03-14  5:05 ` Junio C Hamano
  2019-03-14 19:12   ` am/cherry-pick/rebase/revert: " Phillip Wood
  3 siblings, 1 reply; 10+ messages in thread
From: Junio C Hamano @ 2019-03-14  5:05 UTC (permalink / raw)
  To: Phillip Wood; +Cc: Git Mailing List, Phillip Wood

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.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* am/cherry-pick/rebase/revert: document --rerere-autoupdate
  2019-03-14  5:05 ` [PATCH 1/4] rebase: document --rerere-autoupdate Junio C Hamano
@ 2019-03-14 19:12   ` Phillip Wood
  2019-03-14 19:12     ` [PATCH v2 1/2] " Phillip Wood
                       ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Phillip Wood @ 2019-03-14 19:12 UTC (permalink / raw)
  To: Git Mailing List, Junio C Hamano; +Cc: Johannes Schindelin

I've squashed the first tree patches together

Best Wishes

Phillip



^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v2 1/2] am/cherry-pick/rebase/revert: document --rerere-autoupdate
  2019-03-14 19:12   ` am/cherry-pick/rebase/revert: " Phillip Wood
@ 2019-03-14 19:12     ` 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
  2 siblings, 0 replies; 10+ messages in thread
From: Phillip Wood @ 2019-03-14 19:12 UTC (permalink / raw)
  To: Git Mailing List, Junio C Hamano; +Cc: Johannes Schindelin, Phillip Wood

From: Phillip Wood <phillip.wood@dunelm.org.uk>

This option was missing from the man pages of these commands.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
 Documentation/git-am.txt          | 5 +++++
 Documentation/git-cherry-pick.txt | 5 +++++
 Documentation/git-rebase.txt      | 5 +++++
 Documentation/git-revert.txt      | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 6f6c34b0f4..fc3b993c33 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -99,6 +99,11 @@ default.   You can use `--no-utf8` to override this.
 	am.threeWay configuration variable. For more information,
 	see am.threeWay in linkgit:git-config[1].
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
+
 --ignore-space-change::
 --ignore-whitespace::
 --whitespace=<option>::
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index b8cfeec67e..d64e72462f 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -148,6 +148,11 @@ effect to your index in a row.
 	Pass the merge strategy-specific option through to the
 	merge strategy.  See linkgit:git-merge[1] for details.
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
+
 SEQUENCER SUBCOMMANDS
 ---------------------
 include::sequencer.txt[]
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
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 837707a8fd..6afccb2f1e 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -101,6 +101,11 @@ effect to your index in a row.
 	Pass the merge strategy-specific option through to the
 	merge strategy.  See linkgit:git-merge[1] for details.
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
+
 SEQUENCER SUBCOMMANDS
 ---------------------
 include::sequencer.txt[]
-- 
2.21.0


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v2 2/2] merge: tweak --rerere-autoupdate documentation
  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     ` Phillip Wood
  2019-03-18  1:25     ` am/cherry-pick/rebase/revert: document --rerere-autoupdate Junio C Hamano
  2 siblings, 0 replies; 10+ messages in thread
From: Phillip Wood @ 2019-03-14 19:12 UTC (permalink / raw)
  To: Git Mailing List, Junio C Hamano; +Cc: Johannes Schindelin, Phillip Wood

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


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: am/cherry-pick/rebase/revert: document --rerere-autoupdate
  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     ` Junio C Hamano
  2 siblings, 0 replies; 10+ messages in thread
From: Junio C Hamano @ 2019-03-18  1:25 UTC (permalink / raw)
  To: Phillip Wood; +Cc: Git Mailing List, Johannes Schindelin

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.

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2019-03-18  1:28 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH 4/4] merge: tweak --rerere-autoupdate documentation Phillip Wood
2019-03-13 22:57   ` 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

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).