Code

Merge branch 'nd/resolve-ref'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:05:50 +0000 (16:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:05:50 +0000 (16:05 -0800)
* nd/resolve-ref:
  Rename resolve_ref() to resolve_ref_unsafe()
  Convert resolve_ref+xstrdup to new resolve_refdup function
  revert: convert resolve_ref() to read_ref_full()

1  2 
branch.c
builtin/branch.c
builtin/checkout.c
builtin/commit.c
builtin/merge.c
builtin/revert.c
cache.h

diff --cc branch.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/merge.c
Simple merge
Simple merge
diff --cc cache.h
Simple merge