path: root/builtin/merge.c
AgeCommit message (Expand)Author
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-19Merge branch 'bw/object-id'Junio C Hamano
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams
2017-05-26use xfopen() in more placesNguyễn Thái Ngọc Duy
2017-05-08tree: convert parse_tree_indirect to struct object_idbrian m. carlson
2017-05-08merge: convert checkout_fast_forward to struct object_idbrian m. carlson
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson
2017-04-20Merge branch 'bc/object-id'Junio C Hamano
2017-03-30Merge branch 'jc/merge-drop-old-syntax'Junio C Hamano
2017-03-27Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson
2017-03-17Merge branch 'bc/object-id'Junio C Hamano
2017-03-14Merge branch 'jk/interpret-branch-name'Junio C Hamano
2017-03-02interpret_branch_name: allow callers to restrict expansionsJeff King
2017-02-22builtin/merge: convert to struct object_idbrian m. carlson
2016-12-27Merge branch 'cp/merge-continue'Junio C Hamano
2016-12-16merge: mark usage error strings for translationJeff King
2016-12-14merge: ensure '--abort' option takes no argumentsChris Packham
2016-12-14merge: add '--continue' option as a synonym for 'git commit'Chris Packham
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano
2016-10-26find_unique_abbrev: use 4-buffer ringJeff King
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe
2016-08-12Merge branch 'rs/merge-add-strategies-simplification'Junio C Hamano
2016-08-05merge: use string_list_split() in add_strategies()René Scharfe
2016-07-26prepare the builtins for a libified merge_recursive()Johannes Schindelin
2016-07-19Merge branch 'jk/write-file'Junio C Hamano
2016-07-19Merge branch 'bc/cocci'Junio C Hamano
2016-07-08use write_file_buf where applicableJeff King
2016-06-28coccinelle: apply object_id Coccinelle transformationsbrian m. carlson
2016-06-28coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson
2016-06-17i18n: merge: change command option help to lowercaseVasco Almeida
2016-06-17i18n: merge: mark messages for translationVasco Almeida
2016-04-25Merge branch 'en/merge-trivial-fix'Junio C Hamano
2016-04-25Merge branch 'dt/pre-refs-backend'Junio C Hamano
2016-04-13builtin/merge.c: fix a bug with trivial mergesElijah Newren
2016-04-10cmd_merge(): remove unneeded flag variableMichael Haggerty
2016-04-08Merge branch 'jc/merge-refuse-new-root'Junio C Hamano
2016-04-06Merge branch 'jv/merge-nothing-into-void'Junio C Hamano
2016-04-03Merge branch 'mm/diff-renames-default'Junio C Hamano
2016-03-23merge: refuse to create too cool a merge by defaultJunio C Hamano
2016-03-23merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano
2016-02-25diff: activate diff.renames by defaultMatthieu Moy
2016-02-22use st_add and st_mult for allocation size computationJeff King
2016-01-13merge: release pack files before garbage-collectingJohannes Schindelin
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Convert struct object to object_idbrian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-10-30Merge branch 'rs/pop-commit'Junio C Hamano
2015-10-26Merge branch 'tk/stripspace'Junio C Hamano