projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 70d7099 0606c36)
Merge branch 'maint-1.6.0' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Jan 2010 08:48:47 +0000 (00:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Jan 2010 08:48:47 +0000 (00:48 -0800)
commit96aa7adda3b0254e4b9904f53bb38cd76bfea7bb
treed1eb57fbedb2e8c321889794c60ded86a9a2e88btree | snapshot
parent70d7099916c9621e157c620f9cc7fc982f109c55commit | diff
parent0606c36a73449e76d8f6133253c1eff291ee8c97commit | diff
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".
builtin-branch.c diff1 | diff2 | blob | history
builtin-checkout.c diff1 | diff2 | blob | history
Git—the stupid content tracker