Sign in
googlers
/
jrn
/
git
/
refs/heads/debian-stable
/
Documentation
/
git-merge-file.txt
ddfc44a8
update documentation for new zdiff3 conflictStyle
by Elijah Newren
· 3 years, 1 month ago
e34f802
merge-file: clamp exit code to maximum 127
by Jeff King
· 9 years ago
67ed84f
Documentation/git-merge-file: document option "--diff3"
by Ralf Thielow
· 11 years ago
5d2fc91
docs: put listed example commands in backticks
by Jeff King
· 13 years ago
48bb914
doc: drop author/documentation sections from most pages
by Jeff King
· 14 years ago
3a15048
merge-file: add option to select union merge favor
by Bert Wesarg
· 15 years ago
11f3aa2
merge-file: add option to specify the marker size
by Bert Wesarg
· 15 years ago
fcb2a7e
Merge branch 'ap/merge-backend-opts'
by Junio C Hamano
· 15 years ago
0b444cd
Documentation: spell 'git cmd' without dash throughout
by Thomas Rast
· 15 years ago
73eb40e
git-merge-file --ours, --theirs
by Junio C Hamano
· 17 years ago
29b802a
Improve language in git-merge.txt and related docs
by Ralf Wildenhues
· 16 years ago
2fd02c9
manpages: italicize nongit command names (if they are in teletype font)
by Jonathan Nieder
· 17 years ago
ba020ef
manpages: italicize git command names (which were in teletype font)
by Jonathan Nieder
· 17 years ago
0979c10
manpages: italicize command names
by Jonathan Nieder
· 17 years ago
483bc4f
Documentation formatting and cleanup
by Jonathan Nieder
· 17 years ago
b1889c3
Documentation: be consistent about "git-" versus "git "
by Jonathan Nieder
· 17 years ago
9e1f0a8
documentation: move git(7) to git(1)
by Christian Couder
· 17 years ago
5162e69
Documentation: rename gitlink macro to linkgit
by Dan McGee
· 17 years ago
c3f0baa
Documentation: sync git.txt command list and manual page title
by Junio C Hamano
· 18 years ago
38477d9
Fix mis-mark-up in git-merge-file.txt documentation
by Junio C Hamano
· 18 years ago
9abaa7f
Document git-merge-file
by Johannes Schindelin
· 18 years ago