diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-05-23 15:52:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-23 15:52:43 -0700 |
| commit | 77599cc0bbd0a08defc3bfa80ca52d931d8dc786 (patch) | |
| tree | 836bbf7742605d6fdccf849bb93919a1db73475b /xdiff/xmerge.c | |
| parent | Add missing "short" alternative to --date in rev-list-options.txt (diff) | |
| parent | rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref (diff) | |
| download | tgif-77599cc0bbd0a08defc3bfa80ca52d931d8dc786.tar.xz | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions