]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eb8381c 8d0fc48)
Merge branch 'master' into np/dreflog
authorJunio C Hamano <junkio@cox.net>
Sun, 4 Feb 2007 06:14:40 +0000 (22:14 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Feb 2007 07:05:34 +0000 (23:05 -0800)
commitd77ee72662a821d66ae218056f0103eb24d8d4b4
treee22abdbd11735a0669362f934ae723d233c87e2btree | snapshot
parenteb8381c88518b10d683a29deea1d43ed671f14eccommit | diff
parent8d0fc48f27304ac1bc7abf802ec53fe66fedb15acommit | diff
Merge branch 'master' into np/dreflog

This is to resolve conflicts early in preparation for possible
inclusion of "reflog on detached HEAD" series by Nico, as having
it in 1.5.0 would really help us remove confusion between
detached and attached states.

Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-branch.c diff1 | diff2 | blob | history
builtin-fsck.c diff1 | diff2 | blob | history
git-checkout.sh diff1 | diff2 | blob | history
refs.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.