![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Jun 2009 06:48:46 +0000 (23:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Jun 2009 06:48:46 +0000 (23:48 -0700) | ||
| commit | 3ba4f3a9fc68ba4c5a0064107e8993c5fc5b684f | |
| tree | ae4db4348f007b3603534d720690869bc5c4b3e0 | tree | snapshot |
| parent | ef52aafa0f8b1d34f2ecd9b58f2198711c87cab3 | commit | diff |
| parent | cd12f536129357d5347c1953db69bde68b5f46c9 | commit | diff |
Merge branch 'maint-1.6.2' into maint
* maint-1.6.2:
git-show-ref.txt: remove word and make consistent
git-svn documentation: fix typo in 'rebase vs. pull/merge' section
use xstrdup, not strdup in ll-merge.c
* maint-1.6.2:
git-show-ref.txt: remove word and make consistent
git-svn documentation: fix typo in 'rebase vs. pull/merge' section
use xstrdup, not strdup in ll-merge.c
| Documentation/git-svn.txt | diff1 | | diff2 | | blob | history |
| ll-merge.c | diff1 | | diff2 | | blob | history |