diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:48:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:48:47 -0800 |
| commit | 96aa7adda3b0254e4b9904f53bb38cd76bfea7bb (patch) | |
| tree | d1eb57fbedb2e8c321889794c60ded86a9a2e88b /submodule.h | |
| parent | textconv: stop leaking file descriptors (diff) | |
| parent | base85: Make the code more obvious instead of explaining the non-obvious (diff) | |
| download | tgif-96aa7adda3b0254e4b9904f53bb38cd76bfea7bb.tar.xz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
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".
Diffstat (limited to 'submodule.h')
0 files changed, 0 insertions, 0 deletions