Code

Merge branch 'lh/branch-rename'
authorJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 19:07:51 +0000 (11:07 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 19:07:51 +0000 (11:07 -0800)
commitabcb49cb56fc6fa047a8838cd47fbdfa48791798
tree5381eab9fd6fc651250d2db8635e2f557675ff7c
parent490e092defd01ff645457cde4e96bc0d0d534ccd
parent678d0f4cbfa7a3b529c6e894f2977bef6a2d3e4c
Merge branch 'lh/branch-rename'

* lh/branch-rename:
  git-branch: let caller specify logmsg
  rename_ref: use lstat(2) when testing for symlink
  git-branch: add options and tests for branch renaming

Conflicts:

builtin-branch.c
builtin-branch.c
refs.c