| commit | d77ee72662a821d66ae218056f0103eb24d8d4b4 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 4 Feb 2007 06:14:40 +0000 (3 22:14 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 4 Feb 2007 07:05:34 +0000 (3 23:05 -0800) | ||
| tree | e22abdbd11735a0669362f934ae723d233c87e2b | treesnapshot (tar.gz zip) |
| parent | eb8381c88518b10d683a29deea1d43ed671f14ec | commitdiff |
| parent | 8d0fc48f27304ac1bc7abf802ec53fe66fedb15a | commitdiff |
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>
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 | blobhistory |
| builtin-fsck.c | diff1 | diff2 | blobhistory |
| git-checkout.sh | diff1 | diff2 | blobhistory |
| refs.c | diff1 | diff2 | blobhistory |