![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Jun 2009 07:49:40 +0000 (00:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Jun 2009 07:49:40 +0000 (00:49 -0700) | ||
| commit | 433e972aeb5e485d2f7a7ac605a1c043822e25d9 | |
| tree | 53d39fd7fdbd01c870d08937e805849dd4d6c404 | tree | snapshot |
| parent | a5adcbe377de7c8f5d794fce1fe2b23a0bddf758 | commit | diff |
| parent | a9b2d42486ee0b461220bf3895114926d9ddf9be | commit | diff |
Merge branch 'maint'
* maint:
blame: correctly handle a path that used to be a directory
add -i: do not dump patch during application
Update draft release notes for 1.6.3.2
grep: fix colouring of matches with zero length
Documentation: teach stash/pop workflow instead of stash/apply
Change xdl_merge to generate output even for null merges
t6023: merge-file fails to output anything for a degenerate merge
* maint:
blame: correctly handle a path that used to be a directory
add -i: do not dump patch during application
Update draft release notes for 1.6.3.2
grep: fix colouring of matches with zero length
Documentation: teach stash/pop workflow instead of stash/apply
Change xdl_merge to generate output even for null merges
t6023: merge-file fails to output anything for a degenerate merge
| builtin-blame.c | diff1 | | diff2 | | blob | history |