diff options
author | Junio C Hamano <junio@kernel.org> | 2011-03-15 23:33:35 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2011-03-15 23:33:35 +0000 |
commit | 5f3d8396896b8e8fffa113072041cb34e9167e8b (patch) | |
tree | 0d4d65f7767f700e03c07981e6163da5a23390c5 /git-merge-index.txt | |
parent | 92faa8075fbefc0ac3d77a3c8b6f5b5f89f6d457 (diff) | |
download | git-htmldocs-5f3d8396896b8e8fffa113072041cb34e9167e8b.tar.gz |
Autogenerated HTML docs for v1.7.4.1-266-ga62ea
Diffstat (limited to 'git-merge-index.txt')
-rw-r--r-- | git-merge-index.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/git-merge-index.txt b/git-merge-index.txt index 921b38f18..6ce54673b 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt @@ -73,15 +73,6 @@ merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing). -Author ------- -Written by Linus Torvalds <torvalds@osdl.org> -One-shot merge by Petr Baudis <pasky@ucw.cz> - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - GIT --- Part of the linkgit:git[1] suite |