index
:
git.git
main
maint
master
next
seen
todo
The core git plumbing
Junio C. Hamano
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
Documentation
/
git-merge-tree.txt
Age
Commit message (
Expand
)
Author
Files
Lines
2024-01-29
merge-tree: accept 3 trees as arguments
Johannes Schindelin
1
-1
/
+4
2023-10-09
documentation: add missing article
Elijah Newren
1
-1
/
+1
2023-10-09
documentation: fix singular vs. plural
Elijah Newren
1
-3
/
+3
2023-03-19
Merge branch 'as/doc-markup-fix'
Junio C Hamano
1
-1
/
+1
2023-03-06
git-merge-tree.txt: replace spurious HTML entity
Andreas Schwab
1
-1
/
+1
2022-11-25
docs: fix description of the `--merge-base` option
Kyle Zhao
1
-2
/
+2
2022-11-12
merge-tree.c: allow specifying the merge-base when --stdin is passed
Kyle Zhao
1
-1
/
+13
2022-11-12
merge-tree.c: add --merge-base=<commit> option
Kyle Zhao
1
-0
/
+4
2022-10-22
merge-tree: support multiple batched merges with --stdin
Elijah Newren
1
-1
/
+29
2022-10-22
merge-tree: update documentation for differences in -z output
Elijah Newren
1
-7
/
+39
2022-06-22
git-merge-tree.txt: add a section on potentional usage mistakes
Elijah Newren
1
-0
/
+53
2022-06-22
merge-tree: add a --allow-unrelated-histories flag
Elijah Newren
1
-0
/
+5
2022-06-22
merge-tree: allow `ls-files -u` style info to be NUL terminated
Elijah Newren
1
-4
/
+17
2022-06-22
merge-tree: provide easy access to `ls-files -u` style info
Elijah Newren
1
-6
/
+28
2022-06-22
merge-tree: provide a list of which files have conflicts
Elijah Newren
1
-0
/
+9
2022-06-22
merge-tree: support including merge messages in output
Elijah Newren
1
-6
/
+41
2022-06-22
merge-tree: implement real merges
Elijah Newren
1
-12
/
+86
2013-09-04
use 'tree-ish' instead of 'treeish'
Richard Hansen
1
-1
/
+1
2011-07-06
Documentation: use [verse] for SYNOPSIS sections
Martin von Zweigbergk
1
-0
/
+1
2011-03-11
doc: drop author/documentation sections from most pages
Jeff King
1
-8
/
+0
2008-12-09
Improve language in git-merge.txt and related docs
Ralf Wildenhues
1
-3
/
+3
2008-07-01
Documentation: be consistent about "git-" versus "git "
Jonathan Nieder
1
-1
/
+1
2008-06-06
documentation: move git(7) to git(1)
Christian Couder
1
-1
/
+1
2008-01-06
Documentation: rename gitlink macro to linkgit
Dan McGee
1
-1
/
+1
2007-06-07
War on whitespace
Junio C Hamano
1
-1
/
+0
2006-04-13
Documentation: add a couple of missing docs.
Junio C Hamano
1
-0
/
+37