diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-13 18:49:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-13 18:49:54 -0700 |
| commit | ea892b27b15fbc46a3bb3ad2ddce737dc6590ae5 (patch) | |
| tree | fd9fdddbc9cc12f924cc47ff7ea2fc9c74787163 /mktree.c | |
| parent | Merge branch 'master' into next (diff) | |
| parent | Merge branch 'lt/fix-config' into lt/config (diff) | |
| download | tgif-ea892b27b15fbc46a3bb3ad2ddce737dc6590ae5.tar.xz | |
Merge branch 'lt/config' into next
* lt/config:
git config syntax updates
Another config file parsing fix.
checkout: use --aggressive when running a 3-way merge (-m).
Fix git-pack-objects for 64-bit platforms
fix diff-delta bad memory access
Diffstat (limited to 'mktree.c')
0 files changed, 0 insertions, 0 deletions