projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fixed two bugs in git-cvsimport-script.
[git.git]
/
Documentation
/
git-merge-one-file-script.txt
diff --git
a/Documentation/git-merge-one-file-script.txt
b/Documentation/git-merge-one-file-script.txt
index
387601d
..
1cfe954
100644
(file)
--- a/
Documentation/git-merge-one-file-script.txt
+++ b/
Documentation/git-merge-one-file-script.txt
@@
-1,6
+1,6
@@
git-merge-one-file-script(1)
============================
git-merge-one-file-script(1)
============================
-v0.
1, May
2005
+v0.
99.4, Aug
2005
NAME
----
NAME
----
@@
-18,7
+18,8
@@
to resolve a merge after the trivial merge done with "git-read-tree -m".
Author
------
Author
------
-Written by Linus Torvalds <torvalds@osdl.org>
+Written by Linus Torvalds <torvalds@osdl.org>,
+Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
Documentation
--------------
Documentation
--------------