summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
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
2016-03-23merge: fix NULL pointer dereference when merging nothing into voidLibravatar Junio C Hamano1-5/+5
2016-02-25diff: activate diff.renames by defaultLibravatar Matthieu Moy1-0/+1
2016-02-22use st_add and st_mult for allocation size computationLibravatar Jeff King1-1/+1
2016-01-13merge: release pack files before garbage-collectingLibravatar Johannes Schindelin1-0/+1
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-25/+25
2015-11-20Convert struct object to object_idLibravatar brian m. carlson1-5/+5
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-27/+27
2015-10-30Merge branch 'rs/pop-commit'Libravatar Junio C Hamano1-7/+5
2015-10-26Merge branch 'tk/stripspace'Libravatar Junio C Hamano1-1/+1
2015-10-26use pop_commit() for consuming the first entry of a struct commit_listLibravatar René Scharfe1-7/+5
2015-10-16strbuf: make stripspace() part of strbufLibravatar Tobias Klauser1-1/+1
2015-10-05use sha1_to_hex_r() instead of strcpyLibravatar Jeff King1-10/+10
2015-08-10memoize common git-path "constant" filesLibravatar Jeff King1-15/+15
2015-06-05Merge branch 'jk/at-push-sha1'Libravatar Junio C Hamano1-1/+1
2015-05-21remote.c: drop "remote" pointer from "struct branch"Libravatar Jeff King1-1/+1
2015-05-19Merge branch 'jc/merge'Libravatar Junio C Hamano1-87/+161
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxLibravatar Junio C Hamano1-0/+1
2015-04-29merge: handle FETCH_HEAD internallyLibravatar Junio C Hamano1-34/+72
2015-04-29merge: decide if we auto-generate the message early in collect_parents()Libravatar Junio C Hamano1-7/+9
2015-04-29merge: make collect_parents() auto-generate the merge messageLibravatar Junio C Hamano1-14/+22
2015-04-29merge: extract prepare_merge_message() logic outLibravatar Junio C Hamano1-11/+15
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 11:42:49 +0000