diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 23:48:28 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 23:48:28 -0700 |
commit | cd12f536129357d5347c1953db69bde68b5f46c9 (patch) | |
tree | 534f1f620a07c4d6d40eec15bc1178a06adef49b /builtin-verify-pack.c | |
parent | 9b7dc7183528d42c46786a0be1acc58d4cd1f47a (diff) | |
parent | 4258c212ca2c3674be4b7e00a19db705eee77a48 (diff) | |
download | git-cd12f536129357d5347c1953db69bde68b5f46c9.tar.gz |
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
Diffstat (limited to 'builtin-verify-pack.c')
0 files changed, 0 insertions, 0 deletions