diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-25 14:19:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-25 14:19:36 -0800 |
| commit | 9b07c152dfce52663795fe9b4e1ed5626bfda455 (patch) | |
| tree | ecfdef38185d587686dc4e0fca893a7399fd9549 /diff.c | |
| parent | Merge branch 'mh/doc-commit-title-not-subject' (diff) | |
| parent | merge-tree: fix link formatting in html docs (diff) | |
| download | git-9b07c152dfce52663795fe9b4e1ed5626bfda455.tar.gz git-9b07c152dfce52663795fe9b4e1ed5626bfda455.zip | |
Merge branch 'pw/merge-tree-stdin-deadlock-fix'
"git merge-tree --stdin" has been improved (including a workaround
for a deadlock).
* pw/merge-tree-stdin-deadlock-fix:
merge-tree: fix link formatting in html docs
merge-tree: improve docs for --stdin
merge-tree: only use basic merge config
merge-tree: remove redundant code
merge-tree --stdin: flush stdout to avoid deadlock
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions