| commit | 74051fa805b2b4aa6a0c2e6d4663dc8969e80967 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Oct 2013 20:32:50 +0000 (23 13:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Oct 2013 20:32:50 +0000 (23 13:32 -0700) | ||
| tree | 9cfef445e4c0d2eed38d7f739157a848921ea697 | treesnapshot (tar.gz zip) |
| parent | 6ba0d9551a2963a6fed83b90b55a373d79ef46d0 | commitdiff |
| parent | b0f49ff13033621af06af742e3615fe905833562 | commitdiff |
Merge branch 'jh/checkout-auto-tracking' into maint
"git branch --track" had a minor regression in v1.8.3.2 and later
that made it impossible to base your local work on anything but a
local branch of the upstream repository you are tracking from.
* jh/checkout-auto-tracking:
t3200: fix failure on case-insensitive filesystems
branch.c: Relax unnecessary requirement on upstream's remote ref name
t3200: Add test demonstrating minor regression in 41c21f2
Refer to branch.<name>.remote/merge when documenting --track
t3200: Minor fix when preparing for tracking failure
t2024: Fix &&-chaining and a couple of typos
"git branch --track" had a minor regression in v1.8.3.2 and later
that made it impossible to base your local work on anything but a
local branch of the upstream repository you are tracking from.
* jh/checkout-auto-tracking:
t3200: fix failure on case-insensitive filesystems
branch.c: Relax unnecessary requirement on upstream's remote ref name
t3200: Add test demonstrating minor regression in 41c21f2
Refer to branch.<name>.remote/merge when documenting --track
t3200: Minor fix when preparing for tracking failure
t2024: Fix &&-chaining and a couple of typos
| branch.c | diff1 | diff2 | blobhistory |