author | Junio C Hamano <gitster@pobox.com> | |
Fri, 9 Dec 2011 21:37:14 +0000 (13:37 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 9 Dec 2011 21:37:14 +0000 (13:37 -0800) | ||
commit | b7f7c07977ab6e41899b835b873a1ac499eaa2b3 | |
tree | 9b20151eb2b1a325ed2c72c22fad41616d8d98db | tree | snapshot |
parent | eb8aa3d2c2849cb3a44396b89054339df38e2bfa | commit | diff |
parent | d5a35c114ab6b4337a1c7598bf75c331d94ee092 | commit | diff |
Merge branch 'nd/resolve-ref'
* nd/resolve-ref:
Copy resolve_ref() return value for longer use
Convert many resolve_ref() calls to read_ref*() and ref_exists()
Conflicts:
builtin/fmt-merge-msg.c
builtin/merge.c
refs.c
* nd/resolve-ref:
Copy resolve_ref() return value for longer use
Convert many resolve_ref() calls to read_ref*() and ref_exists()
Conflicts:
builtin/fmt-merge-msg.c
builtin/merge.c
refs.c
builtin/branch.c | diff1 | | diff2 | | blob | history |
builtin/checkout.c | diff1 | | diff2 | | blob | history |
builtin/commit.c | diff1 | | diff2 | | blob | history |
builtin/fmt-merge-msg.c | diff1 | | diff2 | | blob | history |
builtin/merge.c | diff1 | | diff2 | | blob | history |
builtin/tag.c | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
notes-merge.c | diff1 | | diff2 | | blob | history |
refs.c | diff1 | | diff2 | | blob | history |