diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-28 15:53:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-28 15:53:11 -0700 |
| commit | abfdc596d871e8b437c7ae9ac5184eb836ba1a77 (patch) | |
| tree | b365e5ea6d6d3f18193eb4680ffa40fb59da6a3f | |
| parent | 0d23421e2a30fb15c5b701c36a2c7b37b9aec58a (diff) | |
| parent | 2566a777747051eaeaaf90f3dc93bf84d2c2edeb (diff) | |
| download | git-abfdc596d871e8b437c7ae9ac5184eb836ba1a77.tar.xz | |
Merge branch 'vd/doc-merge-tree-x-option' into maint-2.45
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 ------ |