Google Git
Sign in
googlers / jrn / git / 6cbec0da471590a2b3de1b98795ba20f274d53fa / builtin / merge.c
  1. f276cae Merge branch 'en/merge-trivial-fix' by Junio C Hamano · 9 years ago
  2. edc2f71 Merge branch 'dt/pre-refs-backend' by Junio C Hamano · 9 years ago
  3. 40d7194 builtin/merge.c: fix a bug with trivial merges by Elijah Newren · 9 years ago
  4. 17377b6 cmd_merge(): remove unneeded flag variable by Michael Haggerty · 9 years ago
  5. d04aa7e Merge branch 'jc/merge-refuse-new-root' by Junio C Hamano · 9 years ago
  6. aad627e Merge branch 'jv/merge-nothing-into-void' by Junio C Hamano · 9 years ago
  7. 5d2a30d Merge branch 'mm/diff-renames-default' by Junio C Hamano · 9 years ago
  8. e379fdf merge: refuse to create too cool a merge by default by Junio C Hamano · 9 years ago
  9. b84e65d merge: fix NULL pointer dereference when merging nothing into void by Junio C Hamano · 9 years ago
  10. 5404c11 diff: activate diff.renames by default by Matthieu Moy · 9 years ago
  11. 50a6c8e use st_add and st_mult for allocation size computation by Jeff King · 9 years ago
  12. dcacb1b merge: release pack files before garbage-collecting by Johannes Schindelin · 9 years ago
  13. ed1c997 Remove get_object_hash. by brian m. carlson · 9 years ago
  14. f2fd076 Convert struct object to object_id by brian m. carlson · 9 years ago
  15. 7999b2c Add several uses of get_object_hash. by brian m. carlson · 9 years ago
  16. 0692a6c Merge branch 'rs/pop-commit' by Junio C Hamano · 9 years ago
  17. 1ad7c0f Merge branch 'tk/stripspace' by Junio C Hamano · 9 years ago
  18. e510ab8 use pop_commit() for consuming the first entry of a struct commit_list by René Scharfe · 9 years ago
  19. 63af4a8 strbuf: make stripspace() part of strbuf by Tobias Klauser · 9 years ago
  20. d59f765 use sha1_to_hex_r() instead of strcpy by Jeff King · 9 years ago
  21. f932729 memoize common git-path "constant" files by Jeff King · 10 years ago
  22. c4a8354 Merge branch 'jk/at-push-sha1' by Junio C Hamano · 10 years ago
  23. 9e3751d remote.c: drop "remote" pointer from "struct branch" by Jeff King · 10 years ago
  24. bcd1ecd Merge branch 'jc/merge' by Junio C Hamano · 10 years ago
  25. d45366e merge: deprecate 'git merge <message> HEAD <commit>' syntax by Junio C Hamano · 10 years ago
  26. 74e8bc5 merge: handle FETCH_HEAD internally by Junio C Hamano · 10 years ago
  27. 7703801 merge: decide if we auto-generate the message early in collect_parents() by Junio C Hamano · 10 years ago
  28. 1cf32f4 merge: make collect_parents() auto-generate the merge message by Junio C Hamano · 10 years ago
  29. 52fecab merge: extract prepare_merge_message() logic out by Junio C Hamano · 10 years ago
  30. 018b3fb merge: narrow scope of merge_names by Junio C Hamano · 10 years ago
  31. 34349db merge: split reduce_parents() out of collect_parents() by Junio C Hamano · 10 years ago
  32. 0b10b8a merge: clarify collect_parents() logic by Junio C Hamano · 10 years ago
  33. 1016658 merge: small leakfix and code simplification by Junio C Hamano · 10 years ago
  34. eaa4e59 merge: do not check argc to determine number of remote heads by Junio C Hamano · 10 years ago
  35. 1faac1c merge: clarify "pulling into void" special case by Junio C Hamano · 10 years ago
  36. 00c7e7e merge: simplify code flow by Junio C Hamano · 10 years ago
  37. 3d6bc9a Revert "merge: pass verbosity flag down to merge-recursive" by Junio C Hamano · 10 years ago
  38. 3cdff83 Merge branch 'jk/merge-quiet' by Junio C Hamano · 10 years ago
  39. 2bf15a3 merge: pass verbosity flag down to merge-recursive by Jeff King · 10 years ago
  40. 9c9b4f2 standardize usage info string format by Alex Henrie · 10 years ago
  41. d61e790 Merge branch 'rs/plug-strbuf-leak-in-merge' by Junio C Hamano · 10 years ago
  42. 0985015 Merge branch 'jc/merge-bases' by Junio C Hamano · 10 years ago
  43. 8d025b7 merge: release strbuf after use in suggest_conflicts() by René Scharfe · 10 years ago
  44. 0ed8a4e Merge branch 'cc/interpret-trailers-more' by Junio C Hamano · 10 years ago
  45. 216d29e Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more by Junio C Hamano · 10 years ago
  46. 2ce406c get_merge_bases(): always clean-up object flags by Junio C Hamano · 10 years ago
  47. 75c961b merge & sequencer: unify codepaths that write "Conflicts:" hint by Junio C Hamano · 10 years ago
  48. 08e3ce5 builtin/merge.c: drop a parameter that is never used by Junio C Hamano · 10 years ago
  49. 7695d11 refs.c: change resolve_ref_unsafe reading argument to be a flags field by Ronnie Sahlberg · 11 years ago
  50. 697cc8e lockfile.h: extract new header file for the functions in lockfile.c by Michael Haggerty · 10 years ago
  51. daccee3 try_merge_strategy(): use a statically-allocated lock_file object by Michael Haggerty · 10 years ago
  52. 1fef4b5 try_merge_strategy(): remove redundant lock_file allocation by Michael Haggerty · 10 years ago
  53. 1c2ea2c Merge branch 'rs/realloc-array' by Junio C Hamano · 10 years ago
  54. 296b4c4 Merge branch 'ah/grammofix' by Junio C Hamano · 10 years ago
  55. 2756ca4 use REALLOC_ARRAY for changing the allocation size of arrays by René Scharfe · 10 years ago
  56. ad5fe37 grammofix in user-facing messages by Alex Henrie · 11 years ago
  57. d318027 run-command: introduce CHILD_PROCESS_INIT by René Scharfe · 11 years ago
  58. 1fc8345 Merge branch 'rs/code-cleaning' by Junio C Hamano · 11 years ago
  59. 788cef8 Merge branch 'nd/split-index' by Junio C Hamano · 11 years ago
  60. 910a09a merge: simplify merge_trivial() by using commit_list_append() by René Scharfe · 11 years ago
  61. 39177c7 Merge branch 'mg/verify-commit' by Junio C Hamano · 11 years ago
  62. 8061ae8 Merge branch 'jk/commit-buffer-length' by Junio C Hamano · 11 years ago
  63. 01e57b5 gpg-interface: provide clear helper for struct signature_check by Michael J Gruber · 11 years ago
  64. 03b8664 read-cache: new API write_locked_index instead of write_index/write_cache by Nguyễn Thái Ngọc Duy · 11 years ago
  65. 3ffefb5 commit_tree: take a pointer/len pair rather than a const strbuf by Jeff King · 11 years ago
  66. b8ef69f Merge branch 'fc/merge-default-to-upstream' by Junio C Hamano · 11 years ago
  67. 2cc70ce Merge branch 'mh/ref-transaction' by Junio C Hamano · 11 years ago
  68. a01f7f2 merge: enable defaulttoupstream by default by Felipe Contreras · 11 years ago
  69. b5a52fa Merge branch 'jc/rev-parse-argh-dashed-multi-words' by Junio C Hamano · 11 years ago
  70. f412411 refs.h: rename the action_on_err constants by Michael Haggerty · 11 years ago
  71. 9abf65d Merge branch 'bp/commit-p-editor' by Junio C Hamano · 11 years ago
  72. e703d71 parse-options: multi-word argh should use dash to separate words by Junio C Hamano · 11 years ago
  73. 0a3beb0 merge: fix GIT_EDITOR override for commit hook by Benoit Pierre · 11 years ago
  74. 15048f8 commit: fix patch hunk editing with "commit -p -m" by Benoit Pierre · 11 years ago
  75. 810273b Merge branch 'nv/commit-gpgsign-config' by Junio C Hamano · 11 years ago
  76. d95bfb1 commit-tree: add the commit.gpgsign option to sign all commits by Nicolas Vigier · 11 years ago
  77. 7b4e2b7 Merge branch 'ef/mingw-write' by Junio C Hamano · 11 years ago
  78. 7edc02f prefer xwrite instead of write by Erik Faye-Lund · 11 years ago
  79. 5955654 replace {pre,suf}fixcmp() with {starts,ends}_with() by Christian Couder · 11 years ago
  80. 90f867b merge: simplify ff-only option by Felipe Contreras · 11 years ago
  81. 89dde78 Merge branch 'rh/ishes-doc' by Junio C Hamano · 11 years ago
  82. a8a5406 use 'commit-ish' instead of 'committish' by Richard Hansen · 12 years ago
  83. d5d09d4 Replace deprecated OPT_BOOLEAN by OPT_BOOL by Stefan Beller · 12 years ago
  84. d3aeb31 Merge branch 'nd/const-struct-cache-entry' by Junio C Hamano · 12 years ago
  85. 9678ee7 Merge branch 'mv/merge-ff-tristate' by Junio C Hamano · 12 years ago
  86. 778e4b8 Merge branch 'ms/remote-tracking-branches-in-doc' by Junio C Hamano · 12 years ago
  87. 9c5e6c8 Convert "struct cache_entry *" to "const ..." wherever possible by Nguyễn Thái Ngọc Duy · 12 years ago
  88. d6ac1d2 Change "remote tracking" to "remote-tracking" by Michael Schubert · 12 years ago
  89. a54841e merge: handle --ff/--no-ff/--ff-only as a tri-state option by Miklos Vajna · 12 years ago
  90. f3f8af0 merge: use help_unknown_ref() by Vikrant Varma · 12 years ago
  91. d5fec92 Merge branch 'sg/gpg-sig' by Junio C Hamano · 12 years ago
  92. e636241 Merge branch 'jc/merge-tag-object' by Junio C Hamano · 12 years ago
  93. eb307ae merge/pull Check for untrusted good GPG signatures by Sebastian Götte · 12 years ago
  94. efed002 merge/pull: verify GPG signatures of commits being merged by Sebastian Götte · 12 years ago
  95. 2d1495f merge: a random object may not necssarily be a commit by Junio C Hamano · 12 years ago
  96. 149a421 Merge branch 'jc/custom-comment-char' by Junio C Hamano · 12 years ago
  97. eff80a9 Allow custom "comment char" by Junio C Hamano · 12 years ago
  98. cf6c52f Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' by Junio C Hamano · 12 years ago
  99. ea12a7d Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' by Junio C Hamano · 12 years ago
  100. 3e4141d merge: Honor prepare-commit-msg return code by Antoine Pelisse · 12 years ago