| commit | 4258c212ca2c3674be4b7e00a19db705eee77a48 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Jun 2009 06:48:21 +0000 (20 23:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Jun 2009 06:48:21 +0000 (20 23:48 -0700) | ||
| tree | 93e421911fc6e07f3dd18ea83aab9bd4ce2dd26e | treesnapshot (tar.gz zip) |
| parent | dfe50511c7e5ec2bc771c9a5f4c3318332a7744e | commitdiff |
| parent | d4900ee48c70114ea3227f922d383de6b273fcde | commitdiff |
Merge branch 'maint-1.6.0' into maint-1.6.1
* 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
* 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
| Documentation/git-svn.txt | diff1 | diff2 | blobhistory |
| ll-merge.c | diff1 | diff2 | blobhistory |