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-rerere.txt | |
| parent | 92faa8075fbefc0ac3d77a3c8b6f5b5f89f6d457 (diff) | |
| download | git-htmldocs-5f3d8396896b8e8fffa113072041cb34e9167e8b.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-266-ga62ea
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index db99d4786..161ecad2a 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -205,11 +205,6 @@ would conflict the same way as the test merge you resolved earlier. 'git rerere' will be run by 'git rebase' to help you resolve this conflict. - -Author ------- -Written by Junio C Hamano <gitster@pobox.com> - GIT --- Part of the linkgit:git[1] suite |