Google Git
Sign in
googlers / jrn / git / 70d3dbfea9e9f59772d358796413725dac158599 / Documentation / merge-options.txt
  1. fa21296 Document positive variant of commit and merge option "--no-verify" by Alex Riesen · 3 years, 4 months ago
  2. 8778fa8 Merge branch 'en/ort-becomes-the-default' by Junio C Hamano · 3 years, 6 months ago
  3. aca13c2 Merge branch 'en/merge-strategy-docs' by Junio C Hamano · 3 years, 6 months ago
  4. 7d0daf3 Merge branch 'en/pull-conflicting-options' by Junio C Hamano · 3 years, 6 months ago
  5. f5a3c5e Update docs for change of default merge backend by Elijah Newren · 3 years, 7 months ago
  6. e80178e Documentation: edit awkward references to `git merge-recursive` by Elijah Newren · 3 years, 7 months ago
  7. fd441eb Documentation: define 'MERGE_AUTOSTASH' by Philippe Blain · 3 years, 7 months ago
  8. 359ff69 pull: update docs & code for option compatibility with rebasing by Elijah Newren · 3 years, 7 months ago
  9. ae2e0ab doc: preparatory clean-up of description on the sign-off option by Junio C Hamano · 4 years, 4 months ago
  10. bf10200 Merge branch 'dl/merge-autostash' by Junio C Hamano · 4 years, 10 months ago
  11. d9f15d3 pull: pass --autostash to merge by Denton Liu · 5 years ago
  12. a03b555 merge: teach --autostash option by Denton Liu · 5 years ago
  13. 5c5bac1 Documentation: document merge option --no-gpg-sign by Đoàn Trần Công Danh · 5 years ago
  14. 031fd4b Documentation: fix a bunch of typos, both old and new by Elijah Newren · 5 years ago
  15. 9bc67b6 Merge branch 'en/merge-options-ff-and-friends' by Junio C Hamano · 5 years ago
  16. 27fd1e4 merge-options.txt: clarify meaning of various ff-related options by Elijah Newren · 6 years ago
  17. a1f3dd7 merge: do no-verify like commit by Michael J Gruber · 6 years ago
  18. 33f2790 Merge branch 'vv/merge-squash-with-explicit-commit' into maint by Junio C Hamano · 6 years ago
  19. 6e0b1c6 Merge branch 'vv/merge-squash-with-explicit-commit' by Junio C Hamano · 6 years ago
  20. 1d14d0c merge: refuse --commit with --squash by Vishal Verma · 6 years ago
  21. 1055997 merge: add scissors line on merge conflict by Denton Liu · 6 years ago
  22. d540b70 merge: cleanup messages like commit by Denton Liu · 6 years ago
  23. 1ede45e merge-options.txt: correct wording of --no-commit option by Elijah Newren · 6 years ago
  24. adcc94a merge: allow fast-forward when merging a tracked tag by Junio C Hamano · 7 years ago
  25. fb4cd88 Merge branch 'wk/pull-signoff' by Junio C Hamano · 7 years ago
  26. 9f8468b Merge branch 'wk/merge-options-gpg-sign-doc' by Junio C Hamano · 7 years ago
  27. 3a4d2c7 pull: pass --signoff/--no-signoff to "git merge" by W. Trevor King · 7 years ago
  28. 488aa65 Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull' by W. Trevor King · 7 years ago
  29. 7560f54 treewide: correct several "up-to-date" to "up to date" by Martin Ågren · 8 years ago
  30. be6ec178 Merge branch 'kf/gpg-sig-verification-doc' by Junio C Hamano · 9 years ago
  31. 05a5869 Documentation: clarify signature verification by Keller Fuchs · 9 years ago
  32. 09c2cb8 pull: pass --allow-unrelated-histories to "git merge" by Junio C Hamano · 9 years ago
  33. a58088a Documentation: fix misuses of "nor" by Justin Lebar · 11 years ago
  34. 6d73dba Merge branch 'jc/maint-pull-docfix' by Junio C Hamano · 11 years ago
  35. 08f19cf Documentation: "git pull" does not have the "-m" option by Junio C Hamano · 11 years ago
  36. 499eace Merge branch 'rh/merge-options-doc-fix' by Junio C Hamano · 12 years ago
  37. 66fa1b2 Documentation/merge-options.txt: restore `-e` option by Richard Hansen · 12 years ago
  38. d5fec92 Merge branch 'sg/gpg-sig' by Junio C Hamano · 12 years ago
  39. eb307ae merge/pull Check for untrusted good GPG signatures by Sebastian Götte · 12 years ago
  40. efed002 merge/pull: verify GPG signatures of commits being merged by Sebastian Götte · 12 years ago
  41. 77c7278 Documentation: merging a tag is a special case by Junio C Hamano · 12 years ago
  42. 5419127 Merge branch 'jc/doc-merge-options' by Junio C Hamano · 13 years ago
  43. 690b297 Documentation/merge-options.txt: group "ff" related options together by Junio C Hamano · 13 years ago
  44. f824628 merge: use editor by default in interactive sessions by Junio C Hamano · 13 years ago
  45. aad2a07 Documentation: fix formatting error in merge-options.txt by Jack Nagel · 13 years ago
  46. 66f4b98 Teach merge the '[-e|--edit]' option by Jay Soffian · 13 years ago
  47. 99bfc66 merge: enable progress reporting for rename detection by Jeff King · 14 years ago
  48. 96e9420 merge: Make '--log' an integer option for number of shortlog entries by Ramkumar Ramachandra · 14 years ago
  49. a6018bb Merge branch 'maint' by Junio C Hamano · 15 years ago
  50. adda3c3 Docs: Add -X option to git-merge's synopsis. by Marc Branchaud · 15 years ago
  51. 409b8d8 Documentation/git-pull: put verbosity options before merge/fetch ones by Tay Ray Chuan · 15 years ago
  52. fcb2a7e Merge branch 'ap/merge-backend-opts' by Junio C Hamano · 15 years ago
  53. 566c511 Document that merge strategies can now take their own options by Junio C Hamano · 17 years ago
  54. 0b444cd Documentation: spell 'git cmd' without dash throughout by Thomas Rast · 15 years ago
  55. 3cc3351 Merge branch 'bg/merge-ff-only' by Junio C Hamano · 15 years ago
  56. 1347483 Teach 'git merge' and 'git pull' the option --ff-only by Björn Gustavsson · 15 years ago
  57. 7c85d27 Documentation/merge-options.txt: order options in alphabetical groups by Jari Aalto · 15 years ago
  58. f5d4c4d merge-options.txt: Clarify merge --squash by Michael J Gruber · 16 years ago
  59. 29b802a Improve language in git-merge.txt and related docs by Ralf Wildenhues · 16 years ago
  60. 7f87aff Teach/Fix pull/fetch -q/-v options by Tuncer Ayaz · 16 years ago
  61. ba020ef manpages: italicize git command names (which were in teletype font) by Jonathan Nieder · 17 years ago
  62. 3240240 Docs: Use "-l::\n--long\n" format in OPTIONS sections by Stephan Beyer · 17 years ago
  63. efb779f merge, pull: add '--(no-)log' command line option by SZEDER Gábor · 17 years ago
  64. 3e6c0a3 add 'merge.stat' config variable by SZEDER Gábor · 17 years ago
  65. d8abe14 merge, pull: introduce '--(no-)stat' option by SZEDER Gábor · 17 years ago
  66. d66424c git-merge: add --ff and --no-ff options by Lars Hjemli · 17 years ago
  67. d08af0a git-merge: add support for --commit and --no-squash by Lars Hjemli · 17 years ago
  68. a6080a0 War on whitespace by Junio C Hamano · 18 years ago
  69. 51e7ecf Add a configuration option to control diffstat after merge by Alex Riesen · 18 years ago
  70. 7d0c688 git-merge --squash by Junio C Hamano · 19 years ago
  71. 9688a88 Documentation: recursive is the default strategy these days. by Junio C Hamano · 19 years ago
  72. 93d69d8 Refactored merge options into separate merge-options.txt. by Jon Loeliger · 19 years ago