author | Junio C Hamano <gitster@pobox.com> | |
Wed, 12 Nov 2008 23:03:57 +0000 (15:03 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 12 Nov 2008 23:03:57 +0000 (15:03 -0800) |
* maint:
Start 1.6.0.5 cycle
Fix pack.packSizeLimit and --max-pack-size handling
checkout: Fix "initial checkout" detection
Remove the period after the git-check-attr summary
Conflicts:
RelNotes
Start 1.6.0.5 cycle
Fix pack.packSizeLimit and --max-pack-size handling
checkout: Fix "initial checkout" detection
Remove the period after the git-check-attr summary
Conflicts:
RelNotes
1 | 2 | |||
---|---|---|---|---|
Documentation/git-check-attr.txt | patch | | diff1 | | diff2 | | blob | history |
builtin-checkout.c | patch | | diff1 | | diff2 | | blob | history |
builtin-pack-objects.c | patch | | diff1 | | diff2 | | blob | history |
cache.h | patch | | diff1 | | diff2 | | blob | history |
read-cache.c | patch | | diff1 | | diff2 | | blob | history |
t/t5300-pack-object.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-check-attr.txt
Simple merge
diff --cc builtin-checkout.c
Simple merge
diff --cc builtin-pack-objects.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc t/t5300-pack-object.sh
Simple merge