diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-11-12 15:03:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-12 15:03:57 -0800 |
| commit | 6cd3729eae8d8945c0482423149163d40afd082c (patch) | |
| tree | 5a41d37b2d0c5f1ba62ebb6d42901ffe4b26a796 /t/t7600-merge.sh | |
| parent | git-diff: Add --staged as a synonym for --cached. (diff) | |
| parent | Start 1.6.0.5 cycle (diff) | |
| download | tgif-6cd3729eae8d8945c0482423149163d40afd082c.tar.xz | |
Merge branch 'maint'
* 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
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions