diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-14 15:55:45 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-14 15:55:46 +0900 |
| commit | 7576e512cec7630ba2a35af33fa00868cedb8e18 (patch) | |
| tree | 347953cd004aaea240335fd3e0785d4d17ba5c20 /Documentation | |
| parent | bee6e7a8f9951e486827bdebd14ab6d93b50a1bf (diff) | |
| parent | 4cc9eb338d8773b4c3909368445404745f94ce69 (diff) | |
| download | git-7576e512cec7630ba2a35af33fa00868cedb8e18.tar.xz | |
Merge branch 'kz/merge-tree-merge-base'
"merge-tree" learns a new `--merge-base` option.
* kz/merge-tree-merge-base:
docs: fix description of the `--merge-base` option
merge-tree.c: allow specifying the merge-base when --stdin is passed
merge-tree.c: add --merge-base=<commit> option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge-tree.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index 04bcc416e6..88ee942101 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -64,6 +64,11 @@ OPTIONS share no common history. This flag can be given to override that check and make the merge proceed anyway. +--merge-base=<commit>:: + Instead of finding the merge-bases for <branch1> and <branch2>, + specify a merge-base for the merge, and specifying multiple bases is + currently not supported. This option is incompatible with `--stdin`. + [[OUTPUT]] OUTPUT ------ @@ -216,6 +221,17 @@ with linkgit:git-merge[1]: * any messages that would have been printed to stdout (the <<IM,Informational messages>>) +INPUT FORMAT +------------ +'git merge-tree --stdin' input format is fully text based. Each line +has this format: + + [<base-commit> -- ]<branch1> <branch2> + +If one line is separated by `--`, the string before the separator is +used for specifying a merge-base for the merge and the string after +the separator describes the branches to be merged. + MISTAKES TO AVOID ----------------- |