| commit | 67fa0a2071853287ec7751c96c0330a38dc66a07 | |
| author | Jeff King <peff@peff.net> | |
| Mon, 29 Oct 2012 08:29:06 +0000 (29 04:29 -0400) | ||
| committer | Jeff King <peff@peff.net> | |
| Mon, 29 Oct 2012 08:29:06 +0000 (29 04:29 -0400) | ||
| tree | 8784c12058cbc12b86c76e0f623bfbe578721892 | treesnapshot (tar.gz zip) |
| parent | 4e7062238bca0f6d82026886cf60db7baf63c7b9 | commitdiff |
| parent | 5ba1a8a735c721cc66cc030866163f6fdb7f5ecb | commitdiff |
Merge branch 'jk/config-ignore-duplicates' into next
Drop duplicate detection from git-config; this lets it
better match the internal config callbacks, which clears up
some corner cases with includes.
* jk/config-ignore-duplicates:
builtin/config.c: Fix a sparse warning
Drop duplicate detection from git-config; this lets it
better match the internal config callbacks, which clears up
some corner cases with includes.
* jk/config-ignore-duplicates:
builtin/config.c: Fix a sparse warning