Google Git
Sign in
googlers / jrn / git / d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7 / builtin / merge.c
  1. b8ef69f Merge branch 'fc/merge-default-to-upstream' by Junio C Hamano · 11 years ago
  2. 2cc70ce Merge branch 'mh/ref-transaction' by Junio C Hamano · 11 years ago
  3. a01f7f2 merge: enable defaulttoupstream by default by Felipe Contreras · 11 years ago
  4. b5a52fa Merge branch 'jc/rev-parse-argh-dashed-multi-words' by Junio C Hamano · 11 years ago
  5. f412411 refs.h: rename the action_on_err constants by Michael Haggerty · 11 years ago
  6. 9abf65d Merge branch 'bp/commit-p-editor' by Junio C Hamano · 11 years ago
  7. e703d71 parse-options: multi-word argh should use dash to separate words by Junio C Hamano · 11 years ago
  8. 0a3beb0 merge: fix GIT_EDITOR override for commit hook by Benoit Pierre · 11 years ago
  9. 15048f8 commit: fix patch hunk editing with "commit -p -m" by Benoit Pierre · 11 years ago
  10. 810273b Merge branch 'nv/commit-gpgsign-config' by Junio C Hamano · 11 years ago
  11. d95bfb1 commit-tree: add the commit.gpgsign option to sign all commits by Nicolas Vigier · 11 years ago
  12. 7b4e2b7 Merge branch 'ef/mingw-write' by Junio C Hamano · 11 years ago
  13. 7edc02f prefer xwrite instead of write by Erik Faye-Lund · 11 years ago
  14. 5955654 replace {pre,suf}fixcmp() with {starts,ends}_with() by Christian Couder · 11 years ago
  15. 90f867b merge: simplify ff-only option by Felipe Contreras · 11 years ago
  16. 89dde78 Merge branch 'rh/ishes-doc' by Junio C Hamano · 11 years ago
  17. a8a5406 use 'commit-ish' instead of 'committish' by Richard Hansen · 12 years ago
  18. d5d09d4 Replace deprecated OPT_BOOLEAN by OPT_BOOL by Stefan Beller · 12 years ago
  19. d3aeb31 Merge branch 'nd/const-struct-cache-entry' by Junio C Hamano · 12 years ago
  20. 9678ee7 Merge branch 'mv/merge-ff-tristate' by Junio C Hamano · 12 years ago
  21. 778e4b8 Merge branch 'ms/remote-tracking-branches-in-doc' by Junio C Hamano · 12 years ago
  22. 9c5e6c8 Convert "struct cache_entry *" to "const ..." wherever possible by Nguyễn Thái Ngọc Duy · 12 years ago
  23. d6ac1d2 Change "remote tracking" to "remote-tracking" by Michael Schubert · 12 years ago
  24. a54841e merge: handle --ff/--no-ff/--ff-only as a tri-state option by Miklos Vajna · 12 years ago
  25. f3f8af0 merge: use help_unknown_ref() by Vikrant Varma · 12 years ago
  26. d5fec92 Merge branch 'sg/gpg-sig' by Junio C Hamano · 12 years ago
  27. e636241 Merge branch 'jc/merge-tag-object' by Junio C Hamano · 12 years ago
  28. eb307ae merge/pull Check for untrusted good GPG signatures by Sebastian Götte · 12 years ago
  29. efed002 merge/pull: verify GPG signatures of commits being merged by Sebastian Götte · 12 years ago
  30. 2d1495f merge: a random object may not necssarily be a commit by Junio C Hamano · 12 years ago
  31. 149a421 Merge branch 'jc/custom-comment-char' by Junio C Hamano · 12 years ago
  32. eff80a9 Allow custom "comment char" by Junio C Hamano · 12 years ago
  33. cf6c52f Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' by Junio C Hamano · 12 years ago
  34. ea12a7d Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' by Junio C Hamano · 12 years ago
  35. 3e4141d merge: Honor prepare-commit-msg return code by Antoine Pelisse · 12 years ago
  36. 9bcbb1c merge --no-edit: do not credit people involved in the side branch by Junio C Hamano · 12 years ago
  37. db699a8 Move try_merge_command and checkout_fast_forward to libgit.a by Nguyễn Thái Ngọc Duy · 12 years ago
  38. 738c218 Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 by Junio C Hamano · 13 years ago
  39. 096bbd6 Merge branch 'nd/i18n-parseopt-help' by Junio C Hamano · 13 years ago
  40. 9cd33bb Merge branch 'tr/void-diff-setup-done' by Junio C Hamano · 13 years ago
  41. 962e629 i18n: merge: mark parseopt strings for translation by Nguyễn Thái Ngọc Duy · 13 years ago
  42. 2845265 diff_setup_done(): return void by Thomas Rast · 13 years ago
  43. f9bc573 ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT by Jeff King · 13 years ago
  44. 283097e Merge branch 'jc/merge-reduce-parents-early' by Junio C Hamano · 13 years ago
  45. e78cbf8 builtin/merge.c: reduce parents early by Junio C Hamano · 13 years ago
  46. b5d887f builtin/merge.c: collect other parents early by Junio C Hamano · 13 years ago
  47. 4c57bd2 builtin/merge.c: remove "remoteheads" global variable by Junio C Hamano · 13 years ago
  48. d82829b Sync with 1.7.9.6 by Junio C Hamano · 13 years ago
  49. d387868 merge: backport GIT_MERGE_AUTOEDIT support by Junio C Hamano · 13 years ago
  50. af05021 Merge branch 'zj/diff-stat-dyncol' by Junio C Hamano · 13 years ago
  51. df44483 diff --stat: add config option to limit graph width by Zbigniew Jędrzejewski-Szmek · 13 years ago
  52. 7a7159a merge --stat: use the full terminal width by Zbigniew Jędrzejewski-Szmek · 13 years ago
  53. 4eed30a Merge branch 'tr/merge-edit-guidance' into maint by Junio C Hamano · 13 years ago
  54. d46f476 merge: do not trust fstat(2) too much when checking interactiveness by Junio C Hamano · 13 years ago
  55. 5cdc9fb Merge branch 'jn/merge-no-edit-fix' by Junio C Hamano · 13 years ago
  56. fd6abd0 Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' by Junio C Hamano · 13 years ago
  57. 3adab6f merge: do not launch an editor on "--no-edit $tag" by Junio C Hamano · 13 years ago
  58. b5c9f1c merge: do not create a signed tag merge under --ff-only option by Junio C Hamano · 13 years ago
  59. 873ce7c Merge branch 'tr/merge-edit-guidance' by Junio C Hamano · 13 years ago
  60. af6b37f Merge branch 'jc/pull-signed-tag' by Junio C Hamano · 13 years ago
  61. f26af3f merge: add instructions to the commit message when editing by Thomas Rast · 13 years ago
  62. f824628 merge: use editor by default in interactive sessions by Junio C Hamano · 13 years ago
  63. 5de89d3 Merge branch 'jc/show-sig' by Junio C Hamano · 13 years ago
  64. 1aea303 Merge branch 'jk/maint-strbuf-missing-init' by Junio C Hamano · 13 years ago
  65. f35ccd9 Merge branch 'nd/war-on-nul-in-commit' by Junio C Hamano · 13 years ago
  66. 2e05710 Merge branch 'nd/resolve-ref' by Junio C Hamano · 13 years ago
  67. 03f94ae Update jk/maint-strbuf-missing-init to builtin/ rename by Junio C Hamano · 13 years ago
  68. 13f8b72 Convert commit_tree() to take strbuf as message by Nguyễn Thái Ngọc Duy · 13 years ago
  69. 6b3c4c0 merge: abort if fails to commit by Nguyễn Thái Ngọc Duy · 13 years ago
  70. 424f30a Merge branch 'nd/ignore-might-be-precious' by Junio C Hamano · 13 years ago
  71. 96ec7b1 Convert resolve_ref+xstrdup to new resolve_refdup function by Nguyễn Thái Ngọc Duy · 13 years ago
  72. b7f7c07 Merge branch 'nd/resolve-ref' by Junio C Hamano · 13 years ago
  73. eb8aa3d Merge branch 'jc/pull-signed-tag' by Junio C Hamano · 13 years ago
  74. a4043ae Merge branch 'jc/request-pull-show-head-4' by Junio C Hamano · 13 years ago
  75. d5a35c1 Copy resolve_ref() return value for longer use by Nguyễn Thái Ngọc Duy · 13 years ago
  76. 9ef5697 Merge branch 'nd/maint-ignore-exclude' by Junio C Hamano · 13 years ago
  77. ce8781e Merge branch 'vr/git-merge-default-to-upstream' by Junio C Hamano · 13 years ago
  78. c1d7036 checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore by Nguyễn Thái Ngọc Duy · 13 years ago
  79. f44054c Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious by Junio C Hamano · 13 years ago
  80. fc001b5 checkout,merge: loosen overwriting untracked file check based on info/exclude by Nguyễn Thái Ngọc Duy · 13 years ago
  81. 5480207 Show error for 'git merge' with unset merge.defaultToUpstream by Vincent van Ravesteijn · 13 years ago
  82. 418c9b1 do not let git_path clobber errno when reporting errors by Jonathan Nieder · 13 years ago
  83. c689332 Convert many resolve_ref() calls to read_ref*() and ref_exists() by Nguyễn Thái Ngọc Duy · 13 years ago
  84. ba3c69a commit: teach --gpg-sign option by Junio C Hamano · 13 years ago
  85. fab47d0 merge: force edit and no-ff mode when merging a tag object by Junio C Hamano · 13 years ago
  86. 274a5c0 merge: record tag objects without peeling in MERGE_HEAD by Junio C Hamano · 13 years ago
  87. ae8e4c9 merge: make usage of commit->util more extensible by Junio C Hamano · 13 years ago
  88. cbda121 fmt-merge-msg: package options into a structure by Junio C Hamano · 13 years ago
  89. 57b58db merge: notice local merging of tags and keep it unwrapped by Junio C Hamano · 13 years ago
  90. d25a265 Merge branch 'nd/maint-autofix-tag-in-head' into maint by Junio C Hamano · 13 years ago
  91. 3dfbe68 Merge branch 'js/merge-edit-option' by Junio C Hamano · 13 years ago
  92. 0fd8cb3 Merge branch 'nd/maint-autofix-tag-in-head' by Junio C Hamano · 13 years ago
  93. 66f4b98 Teach merge the '[-e|--edit]' option by Jay Soffian · 13 years ago
  94. 898eacd fmt-merge-msg: use branch.$name.description by Junio C Hamano · 13 years ago
  95. c672f01 Merge branch 'jc/want-commit' by Junio C Hamano · 13 years ago
  96. baf18fc Accept tags in HEAD or MERGE_HEAD by Nguyễn Thái Ngọc Duy · 13 years ago
  97. 894642f merge: remove global variable head[] by Nguyễn Thái Ngọc Duy · 13 years ago
  98. 10b98fa merge: use return value of resolve_ref() to determine if HEAD is invalid by Nguyễn Thái Ngọc Duy · 13 years ago
  99. 6099835 Allow git merge ":/<pattern>" by Junio C Hamano · 14 years ago
  100. f946b46 Merge branch 'jk/color-and-pager' by Junio C Hamano · 14 years ago