| commit | 7576e512cec7630ba2a35af33fa00868cedb8e18 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Dec 2022 06:55:45 +0000 (14 15:55 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Dec 2022 06:55:46 +0000 (14 15:55 +0900) | ||
| tree | 347953cd004aaea240335fd3e0785d4d17ba5c20 | treesnapshot (tar.gz zip) |
| parent | bee6e7a8f9951e486827bdebd14ab6d93b50a1bf | commitdiff |
| parent | 4cc9eb338d8773b4c3909368445404745f94ce69 | commitdiff |
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
"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
| builtin/merge-tree.c | diff1 | diff2 | blobhistory |