From: Junio C Hamano <junkio@cox.net>
Date: Wed, 13 Dec 2006 19:07:51 +0000 (-0800)
Subject: Merge branch 'lh/branch-rename'
X-Git-Tag: v1.5.0-rc0~121
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=abcb49cb56fc6fa047a8838cd47fbdfa48791798;p=git.git

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
---

abcb49cb56fc6fa047a8838cd47fbdfa48791798
diff --cc builtin-branch.c
index d1c243d37,3fc6f8477..560309cb1
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@@ -327,7 -284,8 +358,8 @@@ int cmd_branch(int argc, const char **a
  	int kinds = REF_LOCAL_BRANCH;
  	int i;
  
+ 	setup_ident();
 -	git_config(git_default_config);
 +	git_config(git_branch_config);
  
  	for (i = 1; i < argc; i++) {
  		const char *arg = argv[i];