]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 37b34c4 6a9ae81)
Merge branch 'pw/merge-tree-stdin-deadlock-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Feb 2025 22:19:36 +0000 (14:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Feb 2025 22:19:36 +0000 (14:19 -0800)
commit9b07c152dfce52663795fe9b4e1ed5626bfda455
treeecfdef38185d587686dc4e0fca893a7399fd9549tree
parent37b34c4e99f0fed81b7523d6e674ca976f994afccommit | diff
parent6a9ae8101525360b8f79ed20d2f483616bd39c90commit | diff
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
Documentation/git-merge-tree.adoc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.