diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:40 +0900 |
| commit | c2b6135a1b52a567c92286bb1d3345b6cb0db584 (patch) | |
| tree | 818729ca026af18c75d0701f953f1cab6b1fb171 /git-gui/lib/merge.tcl | |
| parent | 88e2efcbc415f234d38e6e1c59c8d8ae03c989b3 (diff) | |
| parent | ffb4568afed7c3eaa20b000683bb82a761d8f717 (diff) | |
| download | git-c2b6135a1b52a567c92286bb1d3345b6cb0db584.tar.gz git-c2b6135a1b52a567c92286bb1d3345b6cb0db584.tar.xz | |
Merge branch 'sw/pull-ipv46-passthru'
Contrary to the documentation, "git pull -4/-6 other-args" did not
ask the underlying "git fetch" to go over IPv4/IPv6, which has been
corrected.
* sw/pull-ipv46-passthru:
pull: pass -4/-6 option to 'git fetch'
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions