Google Git
Sign in
googlers / jrn / git / d48453dcc023b98e0f0c00ffb586cb01bedbde2f / Documentation / git-merge.txt
  1. f0ecac2 merge: --log appends shortlog to message if specified by Tay Ray Chuan · 15 years ago
  2. adda3c3 Docs: Add -X option to git-merge's synopsis. by Marc Branchaud · 15 years ago
  3. 77b3b79 Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast by Junio C Hamano · 15 years ago
  4. 3588cf9 Documentation: merge: use MERGE_HEAD to refer to the remote branch by Jonathan Nieder · 15 years ago
  5. ebef7e5 Documentation: simplify How Merge Works by Jonathan Nieder · 15 years ago
  6. 2928031 Documentation: merge: add a section about fast-forward by Jonathan Nieder · 15 years ago
  7. 30f2bad Documentation: emphasize when git merge terminates early by Jonathan Nieder · 15 years ago
  8. b40bb37 Documentation: merge: add an overview by Jonathan Nieder · 15 years ago
  9. a4081ba Documentation: merge: move merge strategy list to end by Jonathan Nieder · 15 years ago
  10. ed4a6ba Documentation: suggest `reset --merge` in How Merge Works section by Jonathan Nieder · 15 years ago
  11. 35e9d63 Documentation: merge: move configuration section to end by Jonathan Nieder · 15 years ago
  12. add0951 Merge remote branch 'remotes/trast-doc/for-next' by Junio C Hamano · 15 years ago
  13. 0b444cd Documentation: spell 'git cmd' without dash throughout by Thomas Rast · 15 years ago
  14. ca76828 Documentation: format full commands in typewriter font by Thomas Rast · 15 years ago
  15. e330d8c Documentation: warn prominently against merging with dirty trees by Thomas Rast · 15 years ago
  16. 57bddb1 Documentation/git-merge: reword references to "remote" and "pull" by Thomas Rast · 15 years ago
  17. cb6020b Teach --[no-]rerere-autoupdate option to merge, revert and friends by Junio C Hamano · 15 years ago
  18. d504f69 modernize fetch/merge/pull examples by Clemens Buchacher · 15 years ago
  19. 25dcc0d Documentation: clarify mergeoptions description by Jonathan Nieder · 15 years ago
  20. 0f8a02c Documentation: git fmt-merge-msg does not have to be a script by Jonathan Nieder · 15 years ago
  21. 22f1fb6 Documentation: merge: one <remote> is required by Paul Bolle · 16 years ago
  22. 9fe0053 Grammar fix for "git merge" man page by Wincent Colaiuta · 16 years ago
  23. 4fa535a Grammar fixes to "merge" and "patch-id" docs by Wincent Colaiuta · 16 years ago
  24. dcb1126 Documentation: remove extra quoting/emphasis around literal texts by Chris Johnsen · 16 years ago
  25. 29b802a Improve language in git-merge.txt and related docs by Ralf Wildenhues · 16 years ago
  26. 9ba929e Merge branch 'jc/better-conflict-resolution' by Shawn O. Pearce · 16 years ago
  27. 3407a7a Fix AsciiDoc errors in merge documentation by Johan Herland · 17 years ago
  28. 70a3f89 git-merge documentation: describe how conflict is presented by Junio C Hamano · 17 years ago
  29. 34ad1af git-merge documentation: more details about resolving conflicts by Dan Hensgen · 17 years ago
  30. f448e24 Make the DESCRIPTION match <x>... items in the SYNOPSIS by Abhijit Menon-Sen · 17 years ago
  31. 59eb68a Update my e-mail address by Junio C Hamano · 17 years ago
  32. c0be8aa Documentation/git-merge.txt: Partial rewrite of How Merge Works by Petr Baudis · 17 years ago
  33. 9869099 Documentation: mention ORIG_HEAD in am, merge, and rebase by Brian Gernhardt · 17 years ago
  34. ba020ef manpages: italicize git command names (which were in teletype font) by Jonathan Nieder · 17 years ago
  35. 483bc4f Documentation formatting and cleanup by Jonathan Nieder · 17 years ago
  36. b1889c3 Documentation: be consistent about "git-" versus "git " by Jonathan Nieder · 17 years ago
  37. 9e1f0a8 documentation: move git(7) to git(1) by Christian Couder · 17 years ago
  38. d8abe14 merge, pull: introduce '--(no-)stat' option by SZEDER Gábor · 17 years ago
  39. f5a84c3 doc: moved merge.* config variables into separate merge-config.txt by SZEDER Gábor · 17 years ago
  40. 81646ad Fix incorrect wording in git-merge.txt. by Matthieu Moy · 17 years ago
  41. b98525e Documentation: fix and clarify grammar in git-merge docs. by Dave Peticolas · 17 years ago
  42. 5162e69 Documentation: rename gitlink macro to linkgit by Dan McGee · 17 years ago
  43. 0e545f7 Documentation: describe 'union' low-level merge driver by Junio C Hamano · 17 years ago
  44. 9c51414 Merge branch 'maint' into HEAD by Junio C Hamano · 17 years ago
  45. dee48c3 git-merge: document but discourage the historical syntax by Junio C Hamano · 17 years ago
  46. e66273a Merge branch 'lh/merge' by Junio C Hamano · 17 years ago
  47. b067439 Fix spelling of overridden in documentation by Shawn Bohrer · 17 years ago
  48. aec7b36 git-merge: add support for branch.<name>.mergeoptions by Lars Hjemli · 17 years ago
  49. 434e6ef Try to be consistent with capitalization in the documentation by Steve Hoelzer · 18 years ago
  50. dbddb71 Update git-merge documentation. by Jakub Narebski · 18 years ago
  51. a6080a0 War on whitespace by Junio C Hamano · 18 years ago
  52. 51e7ecf Add a configuration option to control diffstat after merge by Alex Riesen · 18 years ago
  53. d7f078b Convert update-index references in docs to add. by Shawn O. Pearce · 18 years ago
  54. 1e8b0d4 git merge documentation: -m is optional by Matthias Lederhofer · 18 years ago
  55. c3f0baa Documentation: sync git.txt command list and manual page title by Junio C Hamano · 18 years ago
  56. f947413 Use GIT_REFLOG_ACTION environment variable instead. by Shawn O. Pearce · 18 years ago
  57. 17bcdad git-merge: make it usable as the first class UI by Junio C Hamano · 18 years ago
  58. addf88e Assorted typo fixes by Pavel Roskin · 19 years ago
  59. 3ae854c Examples of resetting. by Junio C Hamano · 19 years ago
  60. 3ace1fe git-merge documentation: conflicting merge leaves higher stages in index by Junio C Hamano · 19 years ago
  61. ffb1a4b Documentation: Describe merge operation a bit better. by Junio C Hamano · 19 years ago
  62. 93d69d8 Refactored merge options into separate merge-options.txt. by Jon Loeliger · 19 years ago
  63. bb73d73 Refactor merge strategies into separate includable file. by Jon Loeliger · 19 years ago
  64. fdd0897 Documentation: git-fetch/pull updates. by Junio C Hamano · 19 years ago
  65. 3746501 Documentation: -merge and -pull: describe merge strategies. by Junio C Hamano · 19 years ago
  66. 3c64314 Documentation for git-fmt-merge-msg by Petr Baudis · 19 years ago
  67. 98438bd Remove the version tags from the manpages by Junio C Hamano · 19 years ago
  68. a7154e9 [PATCH] Documentation: Update all files to use the new gitlink: macro by Sergey Vlasov · 19 years ago
  69. 0f69be5 'git-merge': Documentation. by Junio C Hamano · 20 years ago