summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
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
2014-07-02Merge branch 'jk/commit-buffer-length'Libravatar Junio C Hamano1-4/+4
2014-06-23gpg-interface: provide clear helper for struct signature_checkLibravatar Michael J Gruber1-4/+1
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheLibravatar Nguyễn Thái Ngọc Duy1-8/+4
2014-06-12commit_tree: take a pointer/len pair rather than a const strbufLibravatar Jeff King1-4/+4
2014-06-03Merge branch 'fc/merge-default-to-upstream'Libravatar Junio C Hamano1-1/+1
2014-06-03Merge branch 'mh/ref-transaction'Libravatar Junio C Hamano1-3/+3
2014-04-22merge: enable defaulttoupstream by defaultLibravatar Felipe Contreras1-1/+1
2014-04-08Merge branch 'jc/rev-parse-argh-dashed-multi-words'Libravatar Junio C Hamano1-1/+1
2014-04-07refs.h: rename the action_on_err constantsLibravatar Michael Haggerty1-3/+3
2014-03-28Merge branch 'bp/commit-p-editor'Libravatar Junio C Hamano1-3/+3
2014-03-24parse-options: multi-word argh should use dash to separate wordsLibravatar Junio C Hamano1-1/+1
2014-03-18merge: fix GIT_EDITOR override for commit hookLibravatar Benoit Pierre1-1/+1
2014-03-18commit: fix patch hunk editing with "commit -p -m"Libravatar Benoit Pierre1-3/+3