Google Git
Sign in
googlers / jrn / git / 0455ec0330fd29146d6e16189cc9262566cc566d / builtin-merge.c
  1. fcb2a7e Merge branch 'ap/merge-backend-opts' by Junio C Hamano · 15 years ago
  2. 6751e04 Merge branch 'jc/cache-unmerge' by Junio C Hamano · 15 years ago
  3. 71b3ef1 Merge branch 'mm/conflict-advice' by Junio C Hamano · 15 years ago
  4. 4a88fb7 Merge branch 'jc/rerere' by Junio C Hamano · 15 years ago
  5. 85e51b7 Make "subtree" part more orthogonal to the rest of merge-recursive. by Junio C Hamano · 17 years ago
  6. 8cc5b29 git merge -X<option> by Avery Pennarun · 15 years ago
  7. d38a30d Be more user-friendly when refusing to do something because of conflict. by Matthieu Moy · 15 years ago
  8. cfc5789 resolve-undo: record resolved conflicts in a new index extension section by Junio C Hamano · 15 years ago
  9. be6ff81 builtin-merge.c: use standard active_cache macros by Junio C Hamano · 15 years ago
  10. 77c29b4 Revert recent "git merge <msg> HEAD <commit>..." deprecation by Junio C Hamano · 15 years ago
  11. cb6020b Teach --[no-]rerere-autoupdate option to merge, revert and friends by Junio C Hamano · 15 years ago
  12. 0748494 Merge branch 'maint' by Junio C Hamano · 15 years ago
  13. ce9d823 merge: do not add standard message when message is given with -m option by Junio C Hamano · 15 years ago
  14. 76bf488 Do not misidentify "git merge foo HEAD" as an old-style invocation by Junio C Hamano · 15 years ago
  15. 36a83f3 Merge branch 'jc/deprecate-old-syntax-from-merge' by Junio C Hamano · 15 years ago
  16. b81e00a git-merge: a deprecation notice of the ancient command line syntax by Junio C Hamano · 15 years ago
  17. 045c050 Merge branch 'mm/maint-merge-ff-error-message-fix' by Junio C Hamano · 15 years ago
  18. 22c4e72 Merge branch 'ap/maint-merge-strategy-list-fix' by Junio C Hamano · 15 years ago
  19. e2ced7d builtin-merge: show user-friendly error messages for fast-forward too. by Matthieu Moy · 15 years ago
  20. 44148f2 Merge remote branch 'ko/master' into HEAD by Junio C Hamano · 15 years ago
  21. ed87465 builtin-merge.c: call exclude_cmds() correctly. by Avery Pennarun · 15 years ago
  22. 4d8c325 Merge branch 'fc/doc-fast-forward' by Junio C Hamano · 15 years ago
  23. 8ac7a77 Merge branch 'maint' by Junio C Hamano · 15 years ago
  24. 3cc3351 Merge branch 'bg/merge-ff-only' by Junio C Hamano · 15 years ago
  25. d629c40 merge: do not setup worktree twice by Jonathan Nieder · 15 years ago
  26. 1347483 Teach 'git merge' and 'git pull' the option --ff-only by Björn Gustavsson · 15 years ago
  27. a75d7b5 Use 'fast-forward' all over the place by Felipe Contreras · 15 years ago
  28. dd2e794 Refactor pretty_print_commit arguments into a struct by Thomas Rast · 15 years ago
  29. b21f9e7 Merge branch 'jk/maint-merge-msg-fix' by Junio C Hamano · 16 years ago
  30. 08ac696 Merge branch 'js/run-command-updates' by Junio C Hamano · 16 years ago
  31. 69a8b7c merge: indicate remote tracking branches in merge message by Jeff King · 16 years ago
  32. 751c597 merge: fix incorrect merge message for ambiguous tag/branch by Jeff King · 16 years ago
  33. dd787c1 Merge branch 'tr/die_errno' by Junio C Hamano · 16 years ago
  34. 5709e03 run_command: return exit code as positive value by Johannes Sixt · 16 years ago
  35. 0721c31 Use die_errno() instead of die() when checking syscalls by Thomas Rast · 16 years ago
  36. d824cbb Convert existing die(..., strerror(errno)) to die_errno() by Thomas Rast · 16 years ago
  37. 2af202b Fix various sparse warnings in the git source code by Linus Torvalds · 16 years ago
  38. 0a17b2c Merge branch 'cb/maint-no-double-merge' by Junio C Hamano · 16 years ago
  39. c8c562a refuse to merge during a merge by Clemens Buchacher · 16 years ago
  40. 3778292 parse-opts: prepare for OPT_FILENAME by Stephen Boyd · 16 years ago
  41. b79376c Merge branch 'maint' by Junio C Hamano · 16 years ago
  42. 2254da0 Merge branch 'maint-1.6.1' into maint by Junio C Hamano · 16 years ago
  43. 3e73cb2 Merge branch 'maint-1.6.0' into maint-1.6.1 by Junio C Hamano · 16 years ago
  44. 345f6e2 builtin-merge: fix a typo in an error message by Allan Caffee · 16 years ago
  45. a552de7 strbuf_branchname(): a wrapper for branch name shorthands by Junio C Hamano · 16 years ago
  46. 431b196 Rename interpret/substitute nth_last_branch functions by Junio C Hamano · 16 years ago
  47. 7c4c97c Turn the flags in struct dir_struct into a single variable by Johannes Schindelin · 16 years ago
  48. c9717ee Teach @{-1} to git merge by Junio C Hamano · 16 years ago
  49. 34263de Replace deprecated dashed git commands in usage by Alexander Potashev · 16 years ago
  50. ae98a00 Move run_hook() from builtin-commit.c into run-command.c (libgit) by Stephan Beyer · 16 years ago
  51. 47d32af Make some of fwrite/fclose/write/close failures visible by Alex Riesen · 16 years ago
  52. 7f87aff Teach/Fix pull/fetch -q/-v options by Tuncer Ayaz · 16 years ago
  53. 4f2d651 Merge branch 'mv/merge-noff' by Junio C Hamano · 16 years ago
  54. f285a2d Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer by Brandon Casey · 16 years ago
  55. 76c3fb1 Merge branch 'mv/merge-refresh' by Shawn O. Pearce · 16 years ago
  56. 6355364 Merge branch 'maint' by Shawn O. Pearce · 16 years ago
  57. 36e4053 builtin-merge.c: allocate correct amount of memory by Brandon Casey · 16 years ago
  58. 19d4b41 Replace xmalloc/memset(0) pairs with xcalloc by Brandon Casey · 16 years ago
  59. cf10f9f builtin-commit: use reduce_heads() only when appropriate by Miklos Vajna · 16 years ago
  60. 668f26f builtin-merge: refresh the index before calling a strategy by Miklos Vajna · 16 years ago
  61. ed520a8 Merge branch 'mv/merge-recursive' by Shawn O. Pearce · 16 years ago
  62. 1fa24f8 Merge branch 'mv/commit-tree' by Shawn O. Pearce · 16 years ago
  63. c9c6cc8 Merge branch 'maint' by Shawn O. Pearce · 16 years ago
  64. dc4179f maint: check return of split_cmdline to avoid bad config strings by Deskin Miller · 16 years ago
  65. ee20a12 commit_tree(): add a new author parameter by Miklos Vajna · 17 years ago
  66. 4271666 builtin-merge: release the lockfile in try_merge_strategy() by Miklos Vajna · 17 years ago
  67. 18668f5 builtin-merge: avoid run_command_v_opt() for recursive and subtree by Miklos Vajna · 17 years ago
  68. b9f62c0 Remove useless memset of static command name lists in builtin-merge.c by Alex Riesen · 17 years ago
  69. e321180 Remove calculation of the longest command name from where it is not used by Alex Riesen · 17 years ago
  70. a1184d8 Merge branch 'mv/merge-custom' by Junio C Hamano · 17 years ago
  71. 49d3536 Merge branch 'maint' to sync with 1.6.0.1 by Junio C Hamano · 17 years ago
  72. 446247d merge: fix numerus bugs around "trivial merge" area by Junio C Hamano · 17 years ago
  73. 4be636f provide more errors for the "merge into empty head" case by Paolo Bonzini · 17 years ago
  74. 131f9a1 Fix "git-merge -s bogo" help text by Junio C Hamano · 17 years ago
  75. 9ca8f60 "git-merge": allow fast-forwarding in a stat-dirty tree by Junio C Hamano · 17 years ago
  76. 9b6bf4d Fix merge name generation in "merge in C" by Junio C Hamano · 17 years ago
  77. 87091b4 builtin-merge: allow using a custom strategy by Miklos Vajna · 17 years ago
  78. 186458b Make non-static functions, that may be static, static by Stephan Beyer · 17 years ago
  79. 5d2299d builtin-merge: add missing structure initialization by Pierre Habouzit · 17 years ago
  80. 1719b5e builtin-merge: give a proper error message for invalid strategies in config by Miklos Vajna · 17 years ago
  81. 74f5b7f builtin-merge.c: Fix option parsing by Michele Ballabio · 17 years ago
  82. ec96224 Teach 'git merge' that some merge strategies no longer exist by Miklos Vajna · 17 years ago
  83. fcab40a Merge branch 'mv/merge-in-c' by Junio C Hamano · 17 years ago
  84. 4393c23 Teach merge.log to "git-merge" again by Junio C Hamano · 17 years ago
  85. 1c7b76b Build in merge by Miklos Vajna · 17 years ago