Merge branch 'mv/maint-branch-m-symref'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Nov 2008 19:33:19 +0000 (11:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Nov 2008 19:33:19 +0000 (11:33 -0800)
* mv/maint-branch-m-symref:
  update-ref --no-deref -d: handle the case when the pointed ref is packed
  git branch -m: forbid renaming of a symref
  Fix git update-ref --no-deref -d.
  rename_ref(): handle the case when the reflog of a ref does not exist
  Fix git branch -m for symrefs.

1  2 
builtin-branch.c
builtin-receive-pack.c
builtin-remote.c
builtin-send-pack.c
builtin-tag.c
cache.h
refs.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin-tag.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc refs.c
Simple merge