git.tremily.us Git - git.git/commit

author	Junio C Hamano <junkio@cox.net>
	Wed, 13 Dec 2006 19:07:51 +0000 (11:07 -0800)
committer	Junio C Hamano <junkio@cox.net>
	Wed, 13 Dec 2006 19:07:51 +0000 (11:07 -0800)
commit	abcb49cb56fc6fa047a8838cd47fbdfa48791798
tree	5381eab9fd6fc651250d2db8635e2f557675ff7c	tree \| snapshot
parent	490e092defd01ff645457cde4e96bc0d0d534ccd	commit \| diff
parent	678d0f4cbfa7a3b529c6e894f2977bef6a2d3e4c	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
refs.c	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker

RSS Atom

builtin-branch.c	diff1 \|	diff2 \|	blob \| history
refs.c	diff1 \|	diff2 \|	blob \| history