tokkee.org
Code
projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Update manpages to reflect new short and long option aliases
[git.git]
/
Documentation
/
git-merge-one-file.txt
diff --git
a/Documentation/git-merge-one-file.txt
b/Documentation/git-merge-one-file.txt
index f80ab3b8c479d787e116298f5446d1ff57ff2774..f35d0e1b4560a4970e7423011b585e1ff7d538c1 100644
(file)
--- a/
Documentation/git-merge-one-file.txt
+++ b/
Documentation/git-merge-one-file.txt
@@
-27,4
+27,3
@@
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
Part of the gitlink:git[7] suite
-