diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:31:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:31:57 -0700 |
| commit | b05fc49adc7fc288ce5b8eebb576b0142297982d (patch) | |
| tree | b60f6b0d11b82d89f623bbb67b565e1f31e34289 /diffcore.h | |
| parent | Merge branch 'bc/http-backend-allow-405' (diff) | |
| parent | t3200: fix failure on case-insensitive filesystems (diff) | |
| download | tgif-b05fc49adc7fc288ce5b8eebb576b0142297982d.tar.xz | |
Merge branch 'jh/checkout-auto-tracking'
Fix 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
Diffstat (limited to 'diffcore.h')
0 files changed, 0 insertions, 0 deletions