Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
Documentation
/
git-merge-tree.txt
Age
Commit message (
Expand
)
Author
2023-03-20
Merge branch 'as/doc-markup-fix'
Junio C Hamano
2023-03-06
git-merge-tree.txt: replace spurious HTML entity
Andreas Schwab
2022-11-25
docs: fix description of the `--merge-base` option
Kyle Zhao
2022-11-13
merge-tree.c: allow specifying the merge-base when --stdin is passed
Kyle Zhao
2022-11-13
merge-tree.c: add --merge-base=<commit> option
Kyle Zhao
2022-10-23
merge-tree: support multiple batched merges with --stdin
Elijah Newren
2022-10-23
merge-tree: update documentation for differences in -z output
Elijah Newren
2022-06-23
git-merge-tree.txt: add a section on potentional usage mistakes
Elijah Newren
2022-06-23
merge-tree: add a --allow-unrelated-histories flag
Elijah Newren
2022-06-23
merge-tree: allow `ls-files -u` style info to be NUL terminated
Elijah Newren
2022-06-23
merge-tree: provide easy access to `ls-files -u` style info
Elijah Newren
2022-06-23
merge-tree: provide a list of which files have conflicts
Elijah Newren
2022-06-23
merge-tree: support including merge messages in output
Elijah Newren
2022-06-23
merge-tree: implement real merges
Elijah Newren
2013-09-05
use 'tree-ish' instead of 'treeish'
Richard Hansen
2011-07-07
Documentation: use [verse] for SYNOPSIS sections
Martin von Zweigbergk
2011-03-11
doc: drop author/documentation sections from most pages
Jeff King
2008-12-10
Improve language in git-merge.txt and related docs
Ralf Wildenhues
2008-07-02
Documentation: be consistent about "git-" versus "git "
Jonathan Nieder
2008-06-06
documentation: move git(7) to git(1)
Christian Couder
2008-01-07
Documentation: rename gitlink macro to linkgit
Dan McGee
2007-06-07
War on whitespace
Junio C Hamano
2006-04-13
Documentation: add a couple of missing docs.
Junio C Hamano