diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-05-19 10:45:28 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 10:45:28 +0300 |
commit | 4ac8371a1ce0df07a2c3389d6acf6c35207a54fa (patch) | |
tree | 0570de778821f4b158c6d7287843b906d68c5b33 /branch.c | |
parent | 3c9b393ca8fdb4db53e461a6f506dd10ed6fbc85 (diff) | |
parent | e3d6539d58238f046ff955330f6e10c447150164 (diff) |
Merge branch 'dl/branch-from-3dot-merge-base'
"git branch new A...B" and "git checkout -b new A...B" have been
taught that in their contexts, the notation A...B means "the merge
base between these two commits", just like "git checkout A...B"
detaches HEAD at that commit.
* dl/branch-from-3dot-merge-base:
branch: make create_branch accept a merge base rev
t2018: cleanup in current test
Diffstat (limited to 'branch.c')
-rw-r--r-- | branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -269,7 +269,7 @@ void create_branch(struct repository *r, } real_ref = NULL; - if (get_oid(start_name, &oid)) { + if (get_oid_mb(start_name, &oid)) { if (explicit_tracking) { if (advice_set_upstream_failure) { error(_(upstream_missing), start_name); |