diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:31:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:31:16 -0700 |
| commit | 1b8e822e572f3c86e0c0d1e9e8bc29d016a4e3d3 (patch) | |
| tree | a41decae00ba264e06d5b43a9ca171581fa5f3f7 /t/t8004-blame-with-conflicts.sh | |
| parent | Merge branch 'mh/maint-revisions-doc' into maint (diff) | |
| parent | checkout: don't confuse ref and object flags (diff) | |
| download | tgif-1b8e822e572f3c86e0c0d1e9e8bc29d016a4e3d3.tar.xz | |
Merge branch 'jk/maint-checkout-orphan-check-fix' into maint
* jk/maint-checkout-orphan-check-fix:
checkout: don't confuse ref and object flags
Diffstat (limited to 't/t8004-blame-with-conflicts.sh')
0 files changed, 0 insertions, 0 deletions