{"thread":{"id":"50732","subject":"[PATCH 1/4] rebase: document --rerere-autoupdate","startedAt":"2019-03-13T18:28:07Z","lastAt":"2019-03-18T01:28:40Z","messageCount":10,"participants":["Phillip Wood","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"371384","messageId":"20190313182756.8076-1-phillip.wood123@gmail.com","threadId":"50732","inReplyTo":null,"subject":"[PATCH 1/4] rebase: document --rerere-autoupdate","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2019-03-13T18:27:53Z","receivedAt":"2019-03-13T18:28:07Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood <phillip.wood@dunelm.org.uk>\n\nThis option was missing from the man page.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n---\n Documentation/git-rebase.txt | 5 +++++\n 1 file changed, 5 insertions(+)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 5629ba4c5d..fbf9a4d70a 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -300,6 +300,11 @@ See also INCOMPATIBLE OPTIONS below.\n +\n See also INCOMPATIBLE OPTIONS below.\n \n+--rerere-autoupdate::\n+--no-rerere-autoupdate::\n+\tAllow the rerere mechanism to update the index with the\n+\tresult of auto-conflict resolution if possible.\n+\n -S[<keyid>]::\n --gpg-sign[=<keyid>]::\n \tGPG-sign commits. The `keyid` argument is optional and\n-- \n2.21.0\n\n"},{"id":"371385","messageId":"20190313182756.8076-2-phillip.wood123@gmail.com","threadId":"50732","inReplyTo":"20190313182756.8076-1-phillip.wood123@gmail.com","subject":"[PATCH 2/4] cherry-pick/revert: document --rerere-autoupdate","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2019-03-13T18:27:54Z","receivedAt":"2019-03-13T18:28:10Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood <phillip.wood@dunelm.org.uk>\n\nThis option was missing from the man pages.\n---\n Documentation/git-cherry-pick.txt | 5 +++++\n Documentation/git-revert.txt      | 5 +++++\n 2 files changed, 10 insertions(+)\n\ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\nindex b8cfeec67e..d64e72462f 100644\n--- a/Documentation/git-cherry-pick.txt\n+++ b/Documentation/git-cherry-pick.txt\n@@ -148,6 +148,11 @@ effect to your index in a row.\n \tPass the merge strategy-specific option through to the\n \tmerge strategy.  See linkgit:git-merge[1] for details.\n \n+--rerere-autoupdate::\n+--no-rerere-autoupdate::\n+\tAllow the rerere mechanism to update the index with the\n+\tresult of auto-conflict resolution if possible.\n+\n SEQUENCER SUBCOMMANDS\n ---------------------\n include::sequencer.txt[]\ndiff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt\nindex 837707a8fd..6afccb2f1e 100644\n--- a/Documentation/git-revert.txt\n+++ b/Documentation/git-revert.txt\n@@ -101,6 +101,11 @@ effect to your index in a row.\n \tPass the merge strategy-specific option through to the\n \tmerge strategy.  See linkgit:git-merge[1] for details.\n \n+--rerere-autoupdate::\n+--no-rerere-autoupdate::\n+\tAllow the rerere mechanism to update the index with the\n+\tresult of auto-conflict resolution if possible.\n+\n SEQUENCER SUBCOMMANDS\n ---------------------\n include::sequencer.txt[]\n-- \n2.21.0\n\n"},{"id":"371386","messageId":"20190313182756.8076-3-phillip.wood123@gmail.com","threadId":"50732","inReplyTo":"20190313182756.8076-1-phillip.wood123@gmail.com","subject":"[PATCH 3/4] am: document --rerere-autoupdate","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2019-03-13T18:27:55Z","receivedAt":"2019-03-13T18:28:11Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood <phillip.wood@dunelm.org.uk>\n\nThis option was missing from the man page.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n---\n Documentation/git-am.txt | 5 +++++\n 1 file changed, 5 insertions(+)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 6f6c34b0f4..fc3b993c33 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -99,6 +99,11 @@ default.   You can use `--no-utf8` to override this.\n \tam.threeWay configuration variable. For more information,\n \tsee am.threeWay in linkgit:git-config[1].\n \n+--rerere-autoupdate::\n+--no-rerere-autoupdate::\n+\tAllow the rerere mechanism to update the index with the\n+\tresult of auto-conflict resolution if possible.\n+\n --ignore-space-change::\n --ignore-whitespace::\n --whitespace=<option>::\n-- \n2.21.0\n\n"},{"id":"371387","messageId":"20190313182756.8076-4-phillip.wood123@gmail.com","threadId":"50732","inReplyTo":"20190313182756.8076-1-phillip.wood123@gmail.com","subject":"[PATCH 4/4] merge: tweak --rerere-autoupdate documentation","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2019-03-13T18:27:56Z","receivedAt":"2019-03-13T18:28:14Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood <phillip.wood@dunelm.org.uk>\n\nSpell out --no-rerere-autoupdate explictly to make searching\neasier. This matches the other --no options in the man page.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n---\n Documentation/git-merge.txt | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 4cc86469f3..6294dbc09d 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -83,7 +83,8 @@ invocations. The automated message can include the branch description.\n If `--log` is specified, a shortlog of the commits being merged\n will be appended to the specified message.\n \n---[no-]rerere-autoupdate::\n+--rerere-autoupdate::\n+--no-rerere-autoupdate::\n \tAllow the rerere mechanism to update the index with the\n \tresult of auto-conflict resolution if possible.\n \n-- \n2.21.0\n\n"},{"id":"371413","messageId":"nycvar.QRO.7.76.6.1903132357070.41@tvgsbejvaqbjf.bet","threadId":"50732","inReplyTo":"20190313182756.8076-4-phillip.wood123@gmail.com","subject":"Re: [PATCH 4/4] merge: tweak --rerere-autoupdate documentation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-03-13T22:57:31Z","receivedAt":"2019-03-13T22:57:41Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Phillip,\n\nOn Wed, 13 Mar 2019, Phillip Wood wrote:\n\n> From: Phillip Wood <phillip.wood@dunelm.org.uk>\n> \n> Spell out --no-rerere-autoupdate explictly to make searching\n> easier. This matches the other --no options in the man page.\n> \n> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n> ---\n>  Documentation/git-merge.txt | 3 ++-\n>  1 file changed, 2 insertions(+), 1 deletion(-)\n> \n> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\n> index 4cc86469f3..6294dbc09d 100644\n> --- a/Documentation/git-merge.txt\n> +++ b/Documentation/git-merge.txt\n> @@ -83,7 +83,8 @@ invocations. The automated message can include the branch description.\n>  If `--log` is specified, a shortlog of the commits being merged\n>  will be appended to the specified message.\n>  \n> ---[no-]rerere-autoupdate::\n> +--rerere-autoupdate::\n> +--no-rerere-autoupdate::\n>  \tAllow the rerere mechanism to update the index with the\n>  \tresult of auto-conflict resolution if possible.\n\nAll four patches make sense to me.\n\nThanks,\nDscho\n"},{"id":"371458","messageId":"xmqqef7a9hbx.fsf@gitster-ct.c.googlers.com","threadId":"50732","inReplyTo":"20190313182756.8076-1-phillip.wood123@gmail.com","subject":"Re: [PATCH 1/4] rebase: document --rerere-autoupdate","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-14T05:05:06Z","receivedAt":"2019-03-14T05:05:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood <phillip.wood123@gmail.com> writes:\n\n> From: Phillip Wood <phillip.wood@dunelm.org.uk>\n>\n> This option was missing from the man page.\n>\n> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n> ---\n\nLooks good, but I do not see what the point is to have 1-3 as three\nseparate patches.  It does make sense to have 4/4 as a separate\nstep, though.\n"},{"id":"371534","messageId":"20190314191234.25553-1-phillip.wood123@gmail.com","threadId":"50732","inReplyTo":"xmqqef7a9hbx.fsf@gitster-ct.c.googlers.com","subject":"am/cherry-pick/rebase/revert: document --rerere-autoupdate","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2019-03-14T19:12:31Z","receivedAt":"2019-03-14T19:12:55Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"I've squashed the first tree patches together\n\nBest Wishes\n\nPhillip\n\n\n"},{"id":"371535","messageId":"20190314191234.25553-2-phillip.wood123@gmail.com","threadId":"50732","inReplyTo":"20190314191234.25553-1-phillip.wood123@gmail.com","subject":"[PATCH v2 1/2] am/cherry-pick/rebase/revert: document --rerere-autoupdate","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2019-03-14T19:12:32Z","receivedAt":"2019-03-14T19:12:57Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood <phillip.wood@dunelm.org.uk>\n\nThis option was missing from the man pages of these commands.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n---\n Documentation/git-am.txt          | 5 +++++\n Documentation/git-cherry-pick.txt | 5 +++++\n Documentation/git-rebase.txt      | 5 +++++\n Documentation/git-revert.txt      | 5 +++++\n 4 files changed, 20 insertions(+)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 6f6c34b0f4..fc3b993c33 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -99,6 +99,11 @@ default.   You can use `--no-utf8` to override this.\n \tam.threeWay configuration variable. For more information,\n \tsee am.threeWay in linkgit:git-config[1].\n \n+--rerere-autoupdate::\n+--no-rerere-autoupdate::\n+\tAllow the rerere mechanism to update the index with the\n+\tresult of auto-conflict resolution if possible.\n+\n --ignore-space-change::\n --ignore-whitespace::\n --whitespace=<option>::\ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\nindex b8cfeec67e..d64e72462f 100644\n--- a/Documentation/git-cherry-pick.txt\n+++ b/Documentation/git-cherry-pick.txt\n@@ -148,6 +148,11 @@ effect to your index in a row.\n \tPass the merge strategy-specific option through to the\n \tmerge strategy.  See linkgit:git-merge[1] for details.\n \n+--rerere-autoupdate::\n+--no-rerere-autoupdate::\n+\tAllow the rerere mechanism to update the index with the\n+\tresult of auto-conflict resolution if possible.\n+\n SEQUENCER SUBCOMMANDS\n ---------------------\n include::sequencer.txt[]\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 5629ba4c5d..fbf9a4d70a 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -300,6 +300,11 @@ See also INCOMPATIBLE OPTIONS below.\n +\n See also INCOMPATIBLE OPTIONS below.\n \n+--rerere-autoupdate::\n+--no-rerere-autoupdate::\n+\tAllow the rerere mechanism to update the index with the\n+\tresult of auto-conflict resolution if possible.\n+\n -S[<keyid>]::\n --gpg-sign[=<keyid>]::\n \tGPG-sign commits. The `keyid` argument is optional and\ndiff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt\nindex 837707a8fd..6afccb2f1e 100644\n--- a/Documentation/git-revert.txt\n+++ b/Documentation/git-revert.txt\n@@ -101,6 +101,11 @@ effect to your index in a row.\n \tPass the merge strategy-specific option through to the\n \tmerge strategy.  See linkgit:git-merge[1] for details.\n \n+--rerere-autoupdate::\n+--no-rerere-autoupdate::\n+\tAllow the rerere mechanism to update the index with the\n+\tresult of auto-conflict resolution if possible.\n+\n SEQUENCER SUBCOMMANDS\n ---------------------\n include::sequencer.txt[]\n-- \n2.21.0\n\n"},{"id":"371536","messageId":"20190314191234.25553-3-phillip.wood123@gmail.com","threadId":"50732","inReplyTo":"20190314191234.25553-1-phillip.wood123@gmail.com","subject":"[PATCH v2 2/2] merge: tweak --rerere-autoupdate documentation","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2019-03-14T19:12:33Z","receivedAt":"2019-03-14T19:13:00Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood <phillip.wood@dunelm.org.uk>\n\nSpell out --no-rerere-autoupdate explictly to make searching\neasier. This matches the other --no options in the man page.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n---\n Documentation/git-merge.txt | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 4cc86469f3..6294dbc09d 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -83,7 +83,8 @@ invocations. The automated message can include the branch description.\n If `--log` is specified, a shortlog of the commits being merged\n will be appended to the specified message.\n \n---[no-]rerere-autoupdate::\n+--rerere-autoupdate::\n+--no-rerere-autoupdate::\n \tAllow the rerere mechanism to update the index with the\n \tresult of auto-conflict resolution if possible.\n \n-- \n2.21.0\n\n"},{"id":"371756","messageId":"xmqq7ecx7z3n.fsf@gitster-ct.c.googlers.com","threadId":"50732","inReplyTo":"20190314191234.25553-1-phillip.wood123@gmail.com","subject":"Re: am/cherry-pick/rebase/revert: document --rerere-autoupdate","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-18T01:25:32Z","receivedAt":"2019-03-18T01:28:40Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood <phillip.wood123@gmail.com> writes:\n\n> I've squashed the first tree patches together\n\nThanks.  The result of the series has no changes and that is good.\n"}]}