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 /builtin/worktree.c | |
| parent | bee6e7a8f9951e486827bdebd14ab6d93b50a1bf (diff) | |
| parent | 4cc9eb338d8773b4c3909368445404745f94ce69 (diff) | |
| download | git-7576e512cec7630ba2a35af33fa00868cedb8e18.tar.gz | |
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 'builtin/worktree.c')
0 files changed, 0 insertions, 0 deletions