aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-18 15:53:37 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-18 15:53:37 -0800
commitc3f0baacadbd7b5710052213a2ec3cdd5b77bb6e (patch)
tree5f79fc30175a5a28a7dbb0ea9ff3893ab2dcdc42 /Documentation/git-merge-one-file.txt
parent377e81392f9c76b8d60499a42256efafc1992309 (diff)
downloadgit-c3f0baacadbd7b5710052213a2ec3cdd5b77bb6e.tar.gz
git-c3f0baacadbd7b5710052213a2ec3cdd5b77bb6e.tar.xz
Documentation: sync git.txt command list and manual page title
Also reorders a handful entries to make each list sorted alphabetically. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
-rw-r--r--Documentation/git-merge-one-file.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index 86aad37c6..f80ab3b8c 100644
--- a/Documentation/git-merge-one-file.txt
+++ b/Documentation/git-merge-one-file.txt
@@ -3,7 +3,7 @@ git-merge-one-file(1)
NAME
----
-git-merge-one-file - The standard helper program to use with "git-merge-index"
+git-merge-one-file - The standard helper program to use with git-merge-index
SYNOPSIS