diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-28 14:47:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-28 14:47:57 +0900 |
| commit | 4da3e234f5a3989328c4dc8368cf5906f8679b30 (patch) | |
| tree | 23d86e9fdcd61fc73422c9efc8e35eb8c959d3b3 /builtin/commit.c | |
| parent | Merge branch 'ks/doc-use-camelcase-for-config-name' (diff) | |
| parent | merge-strategies: avoid implying that "-s theirs" exists (diff) | |
| download | git-4da3e234f5a3989328c4dc8368cf5906f8679b30.tar.gz git-4da3e234f5a3989328c4dc8368cf5906f8679b30.zip | |
Merge branch 'jc/merge-x-theirs-docfix'
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 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions