summaryrefslogtreecommitdiffstats
path: root/Documentation/git-config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-11 20:15:10 +0200
committerJunio C Hamano <gitster@pobox.com>2012-05-11 20:15:10 +0200
commit485cfd1a9214af705294ec0fd345450cca0ab16d (patch)
tree7c8542ad3c1957b96555b7fd23f8e9794af881ba /Documentation/git-config.txt
parentMerge branch 'sl/test-wc-l-line-count' into maint (diff)
parentunpack-trees: plug minor memory leak (diff)
downloadgit-485cfd1a9214af705294ec0fd345450cca0ab16d.tar.xz
git-485cfd1a9214af705294ec0fd345450cca0ab16d.zip
Merge branch 'rs/unpack-trees-leakfix' into maint
By René Scharfe * rs/unpack-trees-leakfix: unpack-trees: plug minor memory leak unpack-trees: don't perform any index operation if we're not merging
Diffstat (limited to 'Documentation/git-config.txt')
0 files changed, 0 insertions, 0 deletions