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-file.txt
Age
Commit message (
Expand
)
Author
2021-12-02
update documentation for new zdiff3 conflictStyle
Elijah Newren
2015-10-29
merge-file: clamp exit code to maximum 127
Jeff King
2013-08-10
Documentation/git-merge-file: document option "--diff3"
Ralf Thielow
2011-08-05
docs: put listed example commands in backticks
Jeff King
2011-03-11
doc: drop author/documentation sections from most pages
Jeff King
2010-03-03
merge-file: add option to select union merge favor
Bert Wesarg
2010-03-03
merge-file: add option to specify the marker size
Bert Wesarg
2010-01-21
Merge branch 'ap/merge-backend-opts'
Junio C Hamano
2010-01-10
Documentation: spell 'git cmd' without dash throughout
Thomas Rast
2009-11-30
git-merge-file --ours, --theirs
Junio C Hamano
2008-12-10
Improve language in git-merge.txt and related docs
Ralf Wildenhues
2008-07-05
manpages: italicize nongit command names (if they are in teletype font)
Jonathan Nieder
2008-07-05
manpages: italicize git command names (which were in teletype font)
Jonathan Nieder
2008-07-05
manpages: italicize command names
Jonathan Nieder
2008-07-02
Documentation formatting and cleanup
Jonathan Nieder
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-01-19
Documentation: sync git.txt command list and manual page title
Junio C Hamano
2006-12-17
Fix mis-mark-up in git-merge-file.txt documentation
Junio C Hamano
2006-12-16
Document git-merge-file
Johannes Schindelin