| commit | 11fbc0b1e1d5435f482af7bf391fd0d679955ba6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jun 2013 21:37:21 +0000 (27 14:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jun 2013 21:37:21 +0000 (27 14:37 -0700) | ||
| tree | 7c4beeb7d7095f2fd3c30b012b6d8872e9db27ab | treesnapshot (tar.gz zip) |
| parent | c0add3073a5bd0e295cdaea76e5c9b7805f8a047 | commitdiff |
| parent | 229177aaea295a3f804f98494d7bcde9c088fc0a | commitdiff |
Merge branch 'jh/checkout-auto-tracking' into maint
* 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>'
* 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>'
| Documentation/git-checkout.txt | diff1 | diff2 | blobhistory |
| Documentation/glossary-content.txt | diff1 | diff2 | blobhistory |
| branch.c | diff1 | diff2 | blobhistory |
| builtin/checkout.c | diff1 | diff2 | blobhistory |