summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2017-08-23merge: save merge state earlierLibravatar Michael J Gruber1-0/+2
2017-08-23merge: split write_merge_state in twoLibravatar Michael J Gruber1-3/+8
2017-08-23merge: clarify call chainLibravatar Michael J Gruber1-0/+2
2017-08-22Merge branch 'rs/merge-microcleanup'Libravatar Junio C Hamano1-2/+2
2017-08-22Merge branch 'ma/parse-maybe-bool'Libravatar Junio C Hamano1-2/+2
2017-08-10merge: use skip_prefix()Libravatar René Scharfe1-2/+2
2017-08-07treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolLibravatar Martin Ågren1-2/+2
2017-07-25merge: add a --signoff flagLibravatar Łukasz Gryglicki1-0/+4
2017-07-17use MOVE_ARRAYLibravatar René Scharfe1-1/+1
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-19Merge branch 'bw/object-id'Libravatar Junio C Hamano1-1/+1
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Libravatar Junio C Hamano1-3/+1
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idLibravatar Brandon Williams1-1/+1
2017-05-26use xfopen() in more placesLibravatar Nguyễn Thái Ngọc Duy1-3/+1
2017-05-08tree: convert parse_tree_indirect to struct object_idLibravatar brian m. carlson1-3/+3
2017-05-08merge: convert checkout_fast_forward to struct object_idLibravatar brian m. carlson1-2/+2
2017-05-08Convert lookup_commit* to struct object_idLibravatar brian m. carlson1-1/+1
2017-04-19Merge branch 'bc/object-id'Libravatar Junio C Hamano1-1/+1
2017-03-30Merge branch 'jc/merge-drop-old-syntax'Libravatar Junio C Hamano1-50/+9
2017-03-26Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZLibravatar brian m. carlson1-1/+1
2017-03-17Merge branch 'bc/object-id'Libravatar Junio C Hamano1-68/+66
2017-03-14Merge branch 'jk/interpret-branch-name'Libravatar Junio C Hamano1-1/+1
2017-03-02interpret_branch_name: allow callers to restrict expansionsLibravatar Jeff King1-1/+1
2017-02-22builtin/merge: convert to struct object_idLibravatar brian m. carlson1-68/+66
2016-12-27Merge branch 'cp/merge-continue'Libravatar Junio C Hamano1-0/+25
2016-12-15merge: mark usage error strings for translationLibravatar Jeff King1-2/+2
2016-12-14merge: ensure '--abort' option takes no argumentsLibravatar Chris Packham1-0/+4
2016-12-14merge: add '--continue' option as a synonym for 'git commit'Libravatar Chris Packham1-0/+21
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Libravatar Junio C Hamano1-3/+3
2016-10-26find_unique_abbrev: use 4-buffer ringLibravatar Jeff King1-6/+5
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2Libravatar René Scharfe1-1/+1
2016-08-12Merge branch 'rs/merge-add-strategies-simplification'Libravatar Junio C Hamano1-34/+10
2016-08-05merge: use string_list_split() in add_strategies()Libravatar René Scharfe1-34/+10
2016-07-26prepare the builtins for a libified merge_recursive()Libravatar Johannes Schindelin1-0/+2
2016-07-19Merge branch 'jk/write-file'Libravatar Junio C Hamano1-40/+5
2016-07-19Merge branch 'bc/cocci'Libravatar Junio C Hamano1-8/+7
2016-07-08use write_file_buf where applicableLibravatar Jeff King1-40/+5
2016-06-28coccinelle: apply object_id Coccinelle transformationsLibravatar brian m. carlson1-7/+6
2016-06-28coccinelle: convert hashcpy() with null_sha1 to hashclr()Libravatar brian m. carlson1-1/+1
2016-06-17i18n: merge: change command option help to lowercaseLibravatar Vasco Almeida1-1/+1
2016-06-17i18n: merge: mark messages for translationLibravatar Vasco Almeida1-5/+5
2016-04-25Merge branch 'en/merge-trivial-fix'Libravatar Junio C Hamano1-0/+8
2016-04-25Merge branch 'dt/pre-refs-backend'Libravatar Junio C Hamano1-2/+2
2016-04-12builtin/merge.c: fix a bug with trivial mergesLibravatar Elijah Newren1-0/+8
2016-04-10cmd_merge(): remove unneeded flag variableLibravatar Michael Haggerty1-2/+2
2016-04-08Merge branch 'jc/merge-refuse-new-root'Libravatar Junio C Hamano1-3/+9
2016-04-06Merge branch 'jv/merge-nothing-into-void'Libravatar Junio C Hamano1-5/+5
2016-04-03Merge branch 'mm/diff-renames-default'Libravatar Junio C Hamano1-0/+1
2016-03-23merge: refuse to create too cool a merge by defaultLibravatar Junio C Hamano1-3/+9