diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:03 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:03 +0900 |
| commit | 77cdf8c6f9d142a8d9693531d442ffa0712874d6 (patch) | |
| tree | 33fb9d829abc6a46aa02ab25778573cef23d2e4c /contrib/persistent-https/proxy.go | |
| parent | 01ae81e028f35fedac97e6e44336305786c3f14c (diff) | |
| parent | c25d98b2a730cbc63033ba3360df2519d43a40cd (diff) | |
| download | git-77cdf8c6f9d142a8d9693531d442ffa0712874d6.tar.gz git-77cdf8c6f9d142a8d9693531d442ffa0712874d6.zip | |
Merge branch 'jc/merge-x-theirs-docfix' into maint
The documentation for '-X<option>' for merges was misleadingly
written to suggest that "-s theirs" exists, which is not the case.
* jc/merge-x-theirs-docfix:
merge-strategies: avoid implying that "-s theirs" exists
Diffstat (limited to 'contrib/persistent-https/proxy.go')
0 files changed, 0 insertions, 0 deletions