Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'gp/branch'
[gitweb.git]
/
Documentation
/
git-read-tree.txt
diff --git
a/Documentation/git-read-tree.txt
b/Documentation/git-read-tree.txt
index 019c8bef7af2868af150b4a13472b8ce26744ea3..84184d6294df83c3229a8035d934b23c598578d1 100644
(file)
--- a/
Documentation/git-read-tree.txt
+++ b/
Documentation/git-read-tree.txt
@@
-341,7
+341,8
@@
have finished your work-in-progress), attempt the merge again.
See Also
--------
-gitlink:git-write-tree[1]; gitlink:git-ls-files[1]
+gitlink:git-write-tree[1]; gitlink:git-ls-files[1];
+gitlink:gitignore[5]
Author
@@
-355,4
+356,3
@@
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
Part of the gitlink:git[7] suite
-