Andrew's git / gitweb.git / diff
?
Merge branch 'maint-1.6.0' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 06:48:21 +0000 (23:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 06:48:21 +0000 (23:48 -0700)
* maint-1.6.0:
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

1  2 
Documentation/git-svn.txt patch | diff1 | diff2 | blob | history
ll-merge.c patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-svn.txt
Simple merge
diff --cc ll-merge.c
Simple merge