diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-15 13:32:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-15 13:32:09 -0700 |
| commit | 1d5742cbf746f9556e6aefdfbed54c452c235d51 (patch) | |
| tree | ed10a8a35c9cc115e883780907f2a1faf24d6719 /Documentation/git-merge-index.txt | |
| parent | a35138af75070adb32cf281a56186c9343af36a4 (diff) | |
| parent | d8f708f860095245c6973ba6b1ada366ce2d5bdf (diff) | |
| download | git-1d5742cbf746f9556e6aefdfbed54c452c235d51.tar.gz | |
Merge branch 'jk/doc-credits' of git://github.com/peff/git
* 'jk/doc-credits' of git://github.com/peff/git:
docs: point git.txt author credits to git-scm.com
doc: add missing git footers
doc: drop author/documentation sections from most pages
Diffstat (limited to 'Documentation/git-merge-index.txt')
| -rw-r--r-- | Documentation/git-merge-index.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 921b38f183..6ce54673b0 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/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 |