X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=a163cfca6993b61b3f3d198bd0980bd1fed37e52;hb=ea56a7ed971f3bd547abb16a3cb9a41c00133c85;hp=dc8a96adb00c0b674e12e071a4a56f89bfe8583d;hpb=35da43e9bb4a5d7542c2ee27e0a3557ac921e3ab;p=git.git diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index dc8a96adb..a163cfca6 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -8,12 +8,12 @@ git-merge-one-file - The standard helper program to use with git-merge-index SYNOPSIS -------- -'git-merge-one-file' +'git merge-one-file' DESCRIPTION ----------- -This is the standard helper program to use with 'git-merge-index' -to resolve a merge after the trivial merge done with 'git-read-tree -m'. +This is the standard helper program to use with 'git merge-index' +to resolve a merge after the trivial merge done with 'git read-tree -m'. Author ------