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

diff --cc builtin-branch.c
index d1c243d372c09e1b664ae8e9b29398341767f8c8,3fc6f84773268379d355c69c0a32d4d9c4b0f630..560309cb154504a8d280f12e3d9d2d3d6d715d7c
--- 1/builtin-branch.c
--- 2/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;
  
 -      git_config(git_default_config);
+       setup_ident();
 +      git_config(git_branch_config);
  
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];

diff --cc refs.c
Simple merge