16 Commits (99b028e5589702320630c094d510d885ac8c9e50)

Author SHA1 Message Date
Bert Wesarg 3a15048d83 merge-file: add option to select union merge favor 15 years ago
Bert Wesarg 11f3aa2305 merge-file: add option to specify the marker size 15 years ago
Thomas Rast 0b444cdb19 Documentation: spell 'git cmd' without dash throughout 15 years ago
Junio C Hamano 73eb40eeaa git-merge-file --ours, --theirs 15 years ago
Ralf Wildenhues 29b802aae6 Improve language in git-merge.txt and related docs 16 years ago
Jonathan Nieder 2fd02c92db manpages: italicize nongit command names (if they are in teletype font) 17 years ago
Jonathan Nieder ba020ef5eb manpages: italicize git command names (which were in teletype font) 17 years ago
Jonathan Nieder 0979c10649 manpages: italicize command names 17 years ago
Jonathan Nieder 483bc4f045 Documentation formatting and cleanup 17 years ago
Jonathan Nieder b1889c36d8 Documentation: be consistent about "git-" versus "git " 17 years ago
Christian Couder 9e1f0a85c6 documentation: move git(7) to git(1) 17 years ago
Dan McGee 5162e69732 Documentation: rename gitlink macro to linkgit 17 years ago
Junio C Hamano c3f0baacad Documentation: sync git.txt command list and manual page title 18 years ago
Junio C Hamano 38477d9e60 Fix mis-mark-up in git-merge-file.txt documentation 18 years ago
Johannes Schindelin 9abaa7f033 Document git-merge-file 18 years ago