![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Jun 2009 06:48:28 +0000 (23:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Jun 2009 06:48:28 +0000 (23:48 -0700) | ||
| commit | cd12f536129357d5347c1953db69bde68b5f46c9 | |
| tree | 534f1f620a07c4d6d40eec15bc1178a06adef49b | tree | snapshot |
| parent | 9b7dc7183528d42c46786a0be1acc58d4cd1f47a | commit | diff |
| parent | 4258c212ca2c3674be4b7e00a19db705eee77a48 | commit | diff |
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1:
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.1:
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 |