diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:49:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:49:47 -0800 |
| commit | c5034673fd92b6278e6c9d55683770ec01fafc89 (patch) | |
| tree | 04435179aa4d3dfb0b2ac746072731929d7adcf1 /t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial | |
| parent | git-clone: add missing comma in --reference documentation (diff) | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| download | tgif-c5034673fd92b6278e6c9d55683770ec01fafc89.tar.xz | |
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1:
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
Conflicts:
diff.c
Diffstat (limited to 't/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial')
0 files changed, 0 insertions, 0 deletions