summaryrefslogtreecommitdiff
path: root/builtin/check-ignore.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-05-29 21:23:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-05-29 21:23:10 (GMT)
commit77eb44b8ed601a17a5ec9b1fb8c4c53ba10aaa56 (patch)
tree9f4d26a64befc377a299f2b98ac551cc824e28a9 /builtin/check-ignore.c
parent3e1e7624aa2aa39890ca49d0f7bd3af397c22b03 (diff)
parent229177aaea295a3f804f98494d7bcde9c088fc0a (diff)
downloadgit-77eb44b8ed601a17a5ec9b1fb8c4c53ba10aaa56.zip
git-77eb44b8ed601a17a5ec9b1fb8c4c53ba10aaa56.tar.gz
git-77eb44b8ed601a17a5ec9b1fb8c4c53ba10aaa56.tar.bz2
Merge branch 'jh/checkout-auto-tracking'
Update "git checkout foo" that DWIMs the intended "upstream" and turns it into "git checkout -t -b foo remotes/origin/foo" to correctly take existing remote definitions into account. The remote "origin" may be what uniquely map its own branch to remotes/some/where/foo but that some/where may not be "origin". * jh/checkout-auto-tracking: glossary: Update and rephrase the definition of a remote-tracking branch branch.c: Validate tracking branches with refspecs instead of refs/remotes/* t9114.2: Don't use --track option against "svn-remote"-tracking branches t7201.24: Add refspec to keep --track working t3200.39: tracking setup should fail if there is no matching refspec. checkout: Use remote refspecs when DWIMming tracking branches t2024: Show failure to use refspec when DWIMming remote branch names t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'
Diffstat (limited to 'builtin/check-ignore.c')
0 files changed, 0 insertions, 0 deletions