diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-18 21:37:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 21:37:12 -0800 |
| commit | 03c6e97f809e5b89089a2c689d6a319e8d471455 (patch) | |
| tree | 35c4f6f2b801f9979feb2aee65578b575bac39bd /t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir | |
| parent | Prevent git blame from segfaulting on a missing author name (diff) | |
| parent | Merge branch 'maint-1.6.3' into maint-1.6.4 (diff) | |
| download | tgif-03c6e97f809e5b89089a2c689d6a319e8d471455.tar.xz | |
Merge branch 'maint-1.6.4' into maint-1.6.5
* maint-1.6.4:
Fix mis-backport of t7002
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails
Diffstat (limited to 't/t4013/diff.diff_--no-index_--name-status_--_dir2_dir')
0 files changed, 0 insertions, 0 deletions