aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-14 21:39:47 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-14 21:39:48 -0700
commit1b9696548b9c9110109110d546b5e779095ee1d9 (patch)
tree934caea3e35e08f9af1814fdd6c81760f1129c2b /ll-merge.c
parentebf91ab3cba533a0338afa44cf9632f9191c2717 (diff)
parentca45d0fa8400325df801cc911f3957d1ae246686 (diff)
downloadgit-1b9696548b9c9110109110d546b5e779095ee1d9.tar.gz
git-1b9696548b9c9110109110d546b5e779095ee1d9.tar.xz
Merge branch 'cn/branch-set-upstream-to'
Finishing touches to the recently graduated topic to introduce "git branch --set-upstream-to" option. * cn/branch-set-upstream-to: completion: complete branch name for "branch --set-upstream-to=" completion: add --set-upstream-to and --unset-upstream
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions