{"thread":{"id":"56206","subject":"[PATCH 00/10] Documentation updates: merge-strategies","startedAt":"2021-08-03T15:35:28Z","lastAt":"2021-08-04T23:51:12Z","messageCount":61,"participants":["Elijah Newren via GitGitGadget","Eric Sunshine","Johannes Schindelin","Elijah Newren","Junio C Hamano","Derrick Stolee","Ramsay Jones"],"isPatch":true,"patchVersion":1,"patchTotal":10},"messages":[{"id":"431824","messageId":"pull.1059.git.git.1628004920.gitgitgadget@gmail.com","threadId":"56206","inReplyTo":null,"subject":"[PATCH 00/10] Documentation updates: merge-strategies","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-08-03T15:35:10Z","receivedAt":"2021-08-03T15:35:28Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"I noticed while updating my switch-default-merge-strategy-to-ort submission,\nthat many of the changes were good documentation updates that we might want\nfor Git v2.33.0. So I pulled those changes out and split them into lots of\nlittle commits so that if any parts need discussion or are objectionable, we\ncan just drop those from this series and apply the rest for v2.33.0.\n\nThe first 9 commits are just small documentation updates, but there is one\ncommit at the end that updates an error message and a code comment.\n\nElijah Newren (10):\n git-rebase.txt: correct antiquated claims about --rebase-merges\n directory-rename-detection.txt: small updates due to merge-ort\n optimizations\n Documentation: edit awkward references to `git merge-recursive`\n merge-strategies.txt: update wording for the resolve strategy\n merge-strategies.txt: do not imply using copy detection is desired\n merge-strategies.txt: avoid giving special preference to patience\n algorithm\n merge-strategies.txt: explain why no-renames might be useful\n merge-strategies.txt: fix simple capitalization error\n Documentation: add coverage of the `ort` merge strategy\n Update error message and code comment\n\n Documentation/git-rebase.txt | 29 ++++++----\n Documentation/merge-options.txt | 4 +-\n Documentation/merge-strategies.txt | 56 +++++++++++--------\n .../technical/directory-rename-detection.txt | 14 +++--\n builtin/merge.c | 2 +-\n sequencer.c | 2 +-\n 6 files changed, 63 insertions(+), 44 deletions(-)\n\n\nbase-commit: 66262451ec94d30ac4b80eb3123549cf7a788afd\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1059%2Fnewren%2Fort-doc-updates-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1059/newren/ort-doc-updates-v1\nPull-Request: https://github.com/git/git/pull/1059\n-- \ngitgitgadget\n"},{"id":"431825","messageId":"ab2367594a3267a5f8d01cdfdcba576f286e3823.1628004920.git.gitgitgadget@gmail.com","threadId":"56206","inReplyTo":"pull.1059.git.git.1628004920.gitgitgadget@gmail.com","subject":"[PATCH 01/10] git-rebase.txt: correct antiquated claims about --rebase-merges","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-08-03T15:35:11Z","receivedAt":"2021-08-03T15:35:28Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nWhen --rebase-merges was first introduced, it only worked with the\n`recursive` strategy. Some time later, it gained support for merges\nusing the `octopus` strategy. The limitation of only supporting these\ntwo strategies was documented in 25cff9f109 (\"rebase -i --rebase-merges:\nadd a section to the man page\", 2018-04-25) and lifted in e145d99347\n(\"rebase -r: support merge strategies other than `recursive`\",\n2019-07-31). However, when the limitation was lifted, the documentation\nwas not updated. Update it now.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/git-rebase.txt | 16 ++++++++++------\n 1 file changed, 10 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 55af6fd24e2..8a67227846a 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -1219,12 +1219,16 @@ successful merge so that the user can edit the message.\n If a `merge` command fails for any reason other than merge conflicts (i.e.\n when the merge operation did not even start), it is rescheduled immediately.\n \n-At this time, the `merge` command will *always* use the `recursive`\n-merge strategy for regular merges, and `octopus` for octopus merges,\n-with no way to choose a different one. To work around\n-this, an `exec` command can be used to call `git merge` explicitly,\n-using the fact that the labels are worktree-local refs (the ref\n-`refs/rewritten/onto` would correspond to the label `onto`, for example).\n+By default, the `merge` command will use the `recursive` merge\n+strategy for regular merges, and `octopus` for octopus merges. One\n+can specify a default strategy for all merges using the `--strategy`\n+argument when invoking rebase, or can override specific merges in the\n+interactive list of commands by using an `exec` command to call `git\n+merge` explicitly with a `--strategy` argument. Note that when\n+calling `git merge` explicitly like this, you can make use of the fact\n+that the labels are worktree-local refs (the ref `refs/rewritten/onto`\n+would correspond to the label `onto`, for example) in order to refer\n+to the branches you want to merge.\n \n Note: the first command (`label onto`) labels the revision onto which\n the commits are rebased; The name `onto` is just a convention, as a nod\n-- \ngitgitgadget\n\n"},{"id":"431826","messageId":"6b89ab8d9b1c03ce97fab73f7a2b4261fd90c0c4.1628004920.git.gitgitgadget@gmail.com","threadId":"56206","inReplyTo":"pull.1059.git.git.1628004920.gitgitgadget@gmail.com","subject":"[PATCH 02/10] directory-rename-detection.txt: small updates due to merge-ort optimizations","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-08-03T15:35:12Z","receivedAt":"2021-08-03T15:35:29Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nIn commit 0c4fd732f0 (\"Move computation of dir_rename_count from\nmerge-ort to diffcore-rename\", 2021-02-27), much of the logic for\ncomputing directory renames moved into diffcore-rename.\ndirectory-rename-detection.txt had claims that all of that logic was\nfound in merge-recursive. Update the documentation.\n\nSigned-off-by: Elijah Newren \n---\n .../technical/directory-rename-detection.txt | 14 ++++++++------\n 1 file changed, 8 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/technical/directory-rename-detection.txt b/Documentation/technical/directory-rename-detection.txt\nindex 49b83ef3cc4..029ee2cedc5 100644\n--- a/Documentation/technical/directory-rename-detection.txt\n+++ b/Documentation/technical/directory-rename-detection.txt\n@@ -2,9 +2,9 @@ Directory rename detection\n ==========================\n \n Rename detection logic in diffcore-rename that checks for renames of\n-individual files is aggregated and analyzed in merge-recursive for cases\n-where combinations of renames indicate that a full directory has been\n-renamed.\n+individual files is also aggregated there and then analyzed in either\n+merge-ort or merge-recursive for cases where combinations of renames\n+indicate that a full directory has been renamed.\n \n Scope of abilities\n ------------------\n@@ -88,9 +88,11 @@ directory rename detection support in:\n Folks have requested in the past that `git diff` detect directory\n renames and somehow simplify its output. It is not clear whether this\n would be desirable or how the output should be simplified, so this was\n- simply not implemented. Further, to implement this, directory rename\n- detection logic would need to move from merge-recursive to\n- diffcore-rename.\n+ simply not implemented. Also, while diffcore-rename has most of the\n+ logic for detecting directory renames, some of the logic is still found\n+ within merge-ort and merge-recursive. Fully supporting directory\n+ rename detection in diffs would require copying or moving the remaining\n+ bits of logic to the diff machinery.\n \n * am\n \n-- \ngitgitgadget\n\n"},{"id":"431827","messageId":"c1d056f0794ddcb0400901228b370b3bb5dfc0da.1628004920.git.gitgitgadget@gmail.com","threadId":"56206","inReplyTo":"pull.1059.git.git.1628004920.gitgitgadget@gmail.com","subject":"[PATCH 03/10] Documentation: edit awkward references to `git merge-recursive`","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-08-03T15:35:13Z","receivedAt":"2021-08-03T15:35:30Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nA few places in the documentation referred to the \"`recursive` strategy\"\nusing the phrase \"`git merge-recursive`\", suggesting that it was forking\nsubprocesses to call a toplevel builtin. Perhaps that was relevant to\nwhen rebase was a shell script, but it seems like a rather indirect way\nto refer to the `recursive` strategy. Simplify the references.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/git-rebase.txt | 4 ++--\n Documentation/merge-options.txt | 4 ++--\n Documentation/merge-strategies.txt | 9 +++++----\n 3 files changed, 9 insertions(+), 8 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 8a67227846a..7044afba362 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -355,8 +355,8 @@ See also INCOMPATIBLE OPTIONS below.\n -s ::\n --strategy=::\n \tUse the given merge strategy.\n-\tIf there is no `-s` option 'git merge-recursive' is used\n-\tinstead. This implies --merge.\n+\tIf there is no `-s` option the `recursive` strategy is the\n+\tdefault. This implies --merge.\n +\n Because 'git rebase' replays each commit from the working branch\n on top of the branch using the given strategy, using\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex eb0aabd396f..f819bd8dd68 100644\n--- a/Documentation/merge-options.txt\n+++ b/Documentation/merge-options.txt\n@@ -112,8 +112,8 @@ With --squash, --commit is not allowed, and will fail.\n \tUse the given merge strategy; can be supplied more than\n \tonce to specify them in the order they should be tried.\n \tIf there is no `-s` option, a built-in list of strategies\n-\tis used instead ('git merge-recursive' when merging a single\n-\thead, 'git merge-octopus' otherwise).\n+\tis used instead (`recursive` when merging a single head,\n+\t`octopus` otherwise).\n \n -X