summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-25 16:00:49 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-25 16:00:49 -0700
commitb0578c9abe77f2e1c958bf76c620d59be6c2cf65 (patch)
tree0c32b868df06907137a47de6ca88dc652b65e5cf /builtin/merge.c
parent3f1c70f717da3c9ec6ae3744593c7f9f3729aad7 (diff)
parente9d4f7405b6ab399ef0ea62a796c646de676555d (diff)
downloadgit-b0578c9abe77f2e1c958bf76c620d59be6c2cf65.tar.gz
Merge branch 'mg/branch-set-upstream-previous'
* mg/branch-set-upstream-previous: branch.c: use the parsed branch name
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions