diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-21 06:48:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 06:48:21 (GMT) |
| commit | 4258c212ca2c3674be4b7e00a19db705eee77a48 (patch) | |
| tree | 93e421911fc6e07f3dd18ea83aab9bd4ce2dd26e /builtin-ls-files.c | |
| parent | dfe50511c7e5ec2bc771c9a5f4c3318332a7744e (diff) | |
| parent | d4900ee48c70114ea3227f922d383de6b273fcde (diff) | |
| download | git-4258c212ca2c3674be4b7e00a19db705eee77a48.zip git-4258c212ca2c3674be4b7e00a19db705eee77a48.tar.gz git-4258c212ca2c3674be4b7e00a19db705eee77a48.tar.bz2 | |
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
Diffstat (limited to 'builtin-ls-files.c')
0 files changed, 0 insertions, 0 deletions