summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
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
2015-04-29merge: narrow scope of merge_namesLibravatar Junio C Hamano1-4/+7
2015-04-29merge: split reduce_parents() out of collect_parents()Libravatar Junio C Hamano1-16/+25
2015-04-29merge: clarify collect_parents() logicLibravatar Junio C Hamano1-2/+11
2015-04-29merge: small leakfix and code simplificationLibravatar Junio C Hamano1-2/+2
2015-04-29merge: do not check argc to determine number of remote headsLibravatar Junio C Hamano1-3/+2
2015-04-29merge: clarify "pulling into void" special caseLibravatar Junio C Hamano1-17/+18
2015-04-29merge: simplify code flowLibravatar Junio C Hamano1-8/+8
2015-04-16Revert "merge: pass verbosity flag down to merge-recursive"Libravatar Junio C Hamano1-4/+0
2015-04-14Merge branch 'jk/merge-quiet'Libravatar Junio C Hamano1-0/+4
2015-04-02merge: pass verbosity flag down to merge-recursiveLibravatar Jeff King1-0/+4
2015-01-14standardize usage info string formatLibravatar Alex Henrie1-2/+2
2015-01-12Merge branch 'rs/plug-strbuf-leak-in-merge'Libravatar Junio C Hamano1-0/+1
2015-01-07Merge branch 'jc/merge-bases'Libravatar Junio C Hamano1-2/+2
2014-12-29merge: release strbuf after use in suggest_conflicts()Libravatar René Scharfe1-0/+1
2014-12-22Merge branch 'cc/interpret-trailers-more'Libravatar Junio C Hamano1-15/+7
2014-11-10Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreLibravatar Junio C Hamano1-15/+7
2014-10-30get_merge_bases(): always clean-up object flagsLibravatar Junio C Hamano1-2/+2
2014-10-24merge & sequencer: unify codepaths that write "Conflicts:" hintLibravatar Junio C Hamano1-13/+5
2014-10-24builtin/merge.c: drop a parameter that is never usedLibravatar Junio C Hamano1-2/+2
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldLibravatar Ronnie Sahlberg1-1/+1
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cLibravatar Michael Haggerty1-0/+1
2014-10-01try_merge_strategy(): use a statically-allocated lock_file objectLibravatar Michael Haggerty1-7/+7
2014-10-01try_merge_strategy(): remove redundant lock_file allocationLibravatar Michael Haggerty1-1/+0
2014-09-26Merge branch 'rs/realloc-array'Libravatar Junio C Hamano1-1/+1
2014-09-19Merge branch 'ah/grammofix'Libravatar Junio C Hamano1-2/+2
2014-09-18use REALLOC_ARRAY for changing the allocation size of arraysLibravatar René Scharfe1-1/+1
2014-09-02grammofix in user-facing messagesLibravatar Alex Henrie1-2/+2
2014-08-20run-command: introduce CHILD_PROCESS_INITLibravatar René Scharfe1-2/+1
2014-07-16Merge branch 'rs/code-cleaning'Libravatar Junio C Hamano1-6/+4
2014-07-16Merge branch 'nd/split-index'Libravatar Junio C Hamano1-8/+4
2014-07-10merge: simplify merge_trivial() by using commit_list_append()Libravatar René Scharfe1-6/+4
2014-07-10Merge branch 'mg/verify-commit'Libravatar Junio C Hamano1-4/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 16:52:16 +0000