diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:46:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:46:38 -0700 |
| commit | 09236d80480c15f6da804e56a80c08d320475fb1 (patch) | |
| tree | fcffb58dc5dc9ae53e93f4f28357f8a15cb43da4 /builtin-upload-archive.c | |
| parent | 7c74c3926ad60ba1bbfed13355f00a29813a0f32 (diff) | |
| parent | ed342fdea0b7fd466ed3257c5e68aa81c391b782 (diff) | |
| download | git-09236d80480c15f6da804e56a80c08d320475fb1.tar.gz | |
Merge branch 'sb/maint-1.6.0-add-config-fix'
* sb/maint-1.6.0-add-config-fix:
add: allow configurations to be overriden by command line
use xstrdup, not strdup in ll-merge.c
Conflicts:
builtin-add.c
Diffstat (limited to 'builtin-upload-archive.c')
0 files changed, 0 insertions, 0 deletions