projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b7dc71 4258c21)
Merge branch 'maint-1.6.1' into maint-1.6.2
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 06:48:28 +0000 (23:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 06:48:28 +0000 (23:48 -0700)
* 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

1  2 
Documentation/git-svn.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-svn.txt
Simple merge
Git—the stupid content tracker