summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-07 21:00:27 -0800
committerJunio C Hamano <gitster@pobox.com>2009-03-07 21:00:27 -0800
commit9a6682bab5e800465f0a4e44cdf18fe396ff4f6d (patch)
tree3c30b2efc28194a883daced243837aa9ce9a69dd /templates
parentd57f07ebae7e84b356ff2b891adeccf965d2ba11 (diff)
parent0d66e95903a5c2567baa61cc7299ce865abe41b1 (diff)
downloadgit-9a6682bab5e800465f0a4e44cdf18fe396ff4f6d.tar.gz
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: builtin-revert.c: release index lock when cherry-picking an empty commit
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions