X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=9c9618cead5ae73a754ce741dfd423a7bd2298ca;hb=cc8eb6407e88a46da6d41e18cffed3878f2c53cf;hp=6412805f06cea538a7d32c1eb8284b045b919b8a;hpb=ebef7e504913a1480310735af9541e26c0b381ba;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 6412805f0..9c9618cea 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s ]... - [-m ] ... + [--[no-]rerere-autoupdate] [-m ] ... 'git merge' HEAD ... DESCRIPTION @@ -61,6 +61,11 @@ include::merge-options.txt[] used to give a good default for automated 'git merge' invocations. +--rerere-autoupdate:: +--no-rerere-autoupdate:: + Allow the rerere mechanism to update the index with the + result of auto-conflict resolution if possible. + ...:: Commits, usually other branch heads, to merge into our branch. You need at least one . Specifying more than one @@ -215,15 +220,17 @@ You can work through the conflict with a number of tools: mergetool which will work you through the merge. * Look at the diffs. `git diff` will show a three-way diff, - highlighting changes from both the HEAD and their versions. + highlighting changes from both the `HEAD` and `MERGE_HEAD` + versions. - * Look at the diffs on their own. `git log --merge -p ` - will show diffs first for the HEAD version and then - their version. + * Look at the diffs from each branch. `git log --merge -p ` + will show diffs first for the `HEAD` version and then the + `MERGE_HEAD` version. * Look at the originals. `git show :1:filename` shows the - common ancestor, `git show :2:filename` shows the HEAD - version and `git show :3:filename` shows their version. + common ancestor, `git show :2:filename` shows the `HEAD` + version, and `git show :3:filename` shows the `MERGE_HEAD` + version. EXAMPLES