Home Home > GIT Browse
diff options
authorBenjamin Poirier <bpoirier@suse.com>2018-09-27 10:17:37 +0900
committerBenjamin Poirier <bpoirier@suse.com>2018-11-09 16:57:01 +0900
commit2286fa511b44f5b1065eeeeb45393e3bc9383d53 (patch)
parent5c7772ab45f67cb35d6a58be2e43c48d4b928bc8 (diff)
scripts/git_sort/README.md: Add update_clone.py documentation
1 files changed, 11 insertions, 0 deletions
diff --git a/scripts/git_sort/README.md b/scripts/git_sort/README.md
index ce349495c7..362254b5fa 100644
--- a/scripts/git_sort/README.md
+++ b/scripts/git_sort/README.md
@@ -270,6 +270,17 @@ conflict can be solved automatically using the git mergetool interface with
the script merge_tool.py. Please see the header of that file for installation
+When using the merge tool, the LINUX_GIT reference repository must fetch from
+the repositories which are the upstream source of patches which were added in
+the remote branch of the merge (the `<commit>` argument to `git merge`) or
+which are in different subsystem maintainer sections between the local and
+remote revisions. A simple way to satisfy that condition is to fetch from all
+remotes configured for git-sort before doing a merge resolution. The script
+`scripts/git_sort/update_clone.py` can be used to create or update the
+configuration of a repository so that it contains all of the remotes
+configured for git-sort. Please see the help message of that script for more
As an example, the merge in kernel-source commit da87d04b3b needed conflict
resolution. Let's redo this resolution using merge_tool: