path: root/advice.h
diff options
authorJunio C Hamano <>2018-08-02 22:30:41 (GMT)
committerJunio C Hamano <>2018-08-02 22:30:41 (GMT)
commit50858edd1aa063d3ee2ecb48672c43630cea9070 (patch)
tree16e42089e479d0776ff94fa9621daf6f815a6668 /advice.h
parenta81575aa91a015535374bb5b1e0e6dc2a81c74ab (diff)
parent8d7b558baebe3abbbad4973ce1e1f87a7da17f47 (diff)
Merge branch 'ab/checkout-default-remote'
"git checkout" and "git worktree add" learned to honor checkout.defaultRemote when auto-vivifying a local branch out of a remote tracking branch in a repository with multiple remotes that have tracking branches that share the same names. * ab/checkout-default-remote: checkout & worktree: introduce checkout.defaultRemote checkout: add advice for ambiguous "checkout <branch>" builtin/checkout.c: use "ret" variable for return checkout: pass the "num_matches" up to callers checkout.c: change "unique" member to "num_matches" checkout.c: introduce an *_INIT macro checkout.h: wrap the arguments to unique_tracking_name() checkout tests: index should be clean after dwim checkout
Diffstat (limited to 'advice.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index 7e93778..ab24df0 100644
--- a/advice.h
+++ b/advice.h
@@ -23,6 +23,7 @@ extern int advice_add_embedded_repo;
extern int advice_ignored_hook;
extern int advice_waiting_for_editor;
extern int advice_graft_file_deprecated;
+extern int advice_checkout_ambiguous_remote_branch_name;
int git_default_advice_config(const char *var, const char *value);
__attribute__((format (printf, 1, 2)))