diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:41 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:41 -0700 |
commit | 50858edd1aa063d3ee2ecb48672c43630cea9070 (patch) | |
tree | 16e42089e479d0776ff94fa9621daf6f815a6668 /Documentation/technical/api-gitattributes.txt | |
parent | Merge branch 'sb/diff-color-move-more' (diff) | |
parent | checkout & worktree: introduce checkout.defaultRemote (diff) | |
download | tgif-50858edd1aa063d3ee2ecb48672c43630cea9070.tar.xz |
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 'Documentation/technical/api-gitattributes.txt')
0 files changed, 0 insertions, 0 deletions