diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-21 16:04:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 16:04:36 -0700 |
| commit | 0445ba2457b066a70334877f2d638e1f7a974220 (patch) | |
| tree | 15c01cdcf04d8a5620ed64f37008bef9a127957c /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'mh/ref-api' (diff) | |
| parent | resolve_ref(): report breakage to the caller without warning (diff) | |
| download | tgif-0445ba2457b066a70334877f2d638e1f7a974220.tar.xz | |
Merge branch 'jc/broken-ref-dwim-fix'
* jc/broken-ref-dwim-fix:
resolve_ref(): report breakage to the caller without warning
resolve_ref(): expose REF_ISBROKEN flag
refs.c: move dwim_ref()/dwim_log() from sha1_name.c
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions