![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Jun 2009 04:46:38 +0000 (21:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Jun 2009 04:46:38 +0000 (21:46 -0700) | ||
| commit | 09236d80480c15f6da804e56a80c08d320475fb1 | |
| tree | fcffb58dc5dc9ae53e93f4f28357f8a15cb43da4 | tree | snapshot |
| parent | 7c74c3926ad60ba1bbfed13355f00a29813a0f32 | commit | diff |
| parent | ed342fdea0b7fd466ed3257c5e68aa81c391b782 | commit | diff |
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
* 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
| builtin-add.c | diff1 | | diff2 | | blob | history |
| ll-merge.c | diff1 | | diff2 | | blob | history |
| t/t3700-add.sh | diff1 | | diff2 | | blob | history |