diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-02-03 22:14:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-03 23:05:34 -0800 |
| commit | d77ee72662a821d66ae218056f0103eb24d8d4b4 (patch) | |
| tree | e22abdbd11735a0669362f934ae723d233c87e2b /diff-lib.c | |
| parent | scan reflogs independently from refs (diff) | |
| parent | Default GIT_MERGE_VERBOSITY to 5 during tests. (diff) | |
| download | tgif-d77ee72662a821d66ae218056f0103eb24d8d4b4.tar.xz | |
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>
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions