diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-10-23 13:32:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-23 13:32:50 -0700 |
| commit | 74051fa805b2b4aa6a0c2e6d4663dc8969e80967 (patch) | |
| tree | 9cfef445e4c0d2eed38d7f739157a848921ea697 /Documentation/git-merge-file.txt | |
| parent | Merge branch 'nd/fetch-into-shallow' into maint (diff) | |
| parent | t3200: fix failure on case-insensitive filesystems (diff) | |
| download | tgif-74051fa805b2b4aa6a0c2e6d4663dc8969e80967.tar.xz | |
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
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions