diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-15 09:52:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-15 09:52:55 -0700 |
| commit | 754ae502191e3f9980b8583280c48368ee667b2c (patch) | |
| tree | 310f487afd8def9870af41bceb9d3fe742673857 | |
| parent | Merge branch 'rs/external-diff-with-exit-code' (diff) | |
| parent | Documentation/git-merge-tree.txt: document -X (diff) | |
| download | git-754ae502191e3f9980b8583280c48368ee667b2c.tar.gz git-754ae502191e3f9980b8583280c48368ee667b2c.zip | |
Merge branch 'vd/doc-merge-tree-x-option'
Doc update.
* vd/doc-merge-tree-x-option:
Documentation/git-merge-tree.txt: document -X
| -rw-r--r-- | Documentation/git-merge-tree.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index dd388fa21d..84cb2edf6d 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -72,6 +72,11 @@ OPTIONS As the merge-base is provided directly, <branch1> and <branch2> do not need to specify commits; trees are enough. +-X<option>:: +--strategy-option=<option>:: + Pass the merge strategy-specific option through to the merge strategy. + See linkgit:git-merge[1] for details. + [[OUTPUT]] OUTPUT ------ |