Google Git
Sign in
googlers / jrn / git / 2adc7dcc111636ed16601dc7516ced1c5cfda088 / Documentation / git-merge-file.txt
  1. 3a15048 merge-file: add option to select union merge favor by Bert Wesarg · 15 years ago
  2. 11f3aa2 merge-file: add option to specify the marker size by Bert Wesarg · 15 years ago
  3. fcb2a7e Merge branch 'ap/merge-backend-opts' by Junio C Hamano · 15 years ago
  4. 0b444cd Documentation: spell 'git cmd' without dash throughout by Thomas Rast · 15 years ago
  5. 73eb40e git-merge-file --ours, --theirs by Junio C Hamano · 17 years ago
  6. 29b802a Improve language in git-merge.txt and related docs by Ralf Wildenhues · 16 years ago
  7. 2fd02c9 manpages: italicize nongit command names (if they are in teletype font) by Jonathan Nieder · 17 years ago
  8. ba020ef manpages: italicize git command names (which were in teletype font) by Jonathan Nieder · 17 years ago
  9. 0979c10 manpages: italicize command names by Jonathan Nieder · 17 years ago
  10. 483bc4f Documentation formatting and cleanup by Jonathan Nieder · 17 years ago
  11. b1889c3 Documentation: be consistent about "git-" versus "git " by Jonathan Nieder · 17 years ago
  12. 9e1f0a8 documentation: move git(7) to git(1) by Christian Couder · 17 years ago
  13. 5162e69 Documentation: rename gitlink macro to linkgit by Dan McGee · 17 years ago
  14. c3f0baa Documentation: sync git.txt command list and manual page title by Junio C Hamano · 18 years ago
  15. 38477d9 Fix mis-mark-up in git-merge-file.txt documentation by Junio C Hamano · 18 years ago
  16. 9abaa7f Document git-merge-file by Johannes Schindelin · 18 years ago