summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2015-01-07Merge branch 'jc/merge-bases'Libravatar Junio C Hamano1-2/+2
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
2014-02-27Merge branch 'nv/commit-gpgsign-config'Libravatar Junio C Hamano1-0/+3
2014-02-24commit-tree: add the commit.gpgsign option to sign all commitsLibravatar Nicolas Vigier1-0/+3
2014-01-27Merge branch 'ef/mingw-write'Libravatar Junio C Hamano1-1/+1
2014-01-17prefer xwrite instead of writeLibravatar Erik Faye-Lund1-1/+1
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Libravatar Christian Couder1-6/+6
2013-10-31merge: simplify ff-only optionLibravatar Felipe Contreras1-9/+2
2013-09-17Merge branch 'rh/ishes-doc'Libravatar Junio C Hamano1-1/+1
2013-09-04use 'commit-ish' instead of 'committish'Libravatar Richard Hansen1-1/+1
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLLibravatar Stefan Beller1-6/+6
2013-07-22Merge branch 'nd/const-struct-cache-entry'Libravatar Junio C Hamano1-1/+1
2013-07-15Merge branch 'mv/merge-ff-tristate'Libravatar Junio C Hamano1-22/+33
2013-07-12Merge branch 'ms/remote-tracking-branches-in-doc'Libravatar Junio C Hamano1-2/+2
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2013-07-03Change "remote tracking" to "remote-tracking"Libravatar Michael Schubert1-2/+2
2013-07-02merge: handle --ff/--no-ff/--ff-only as a tri-state optionLibravatar Miklos Vajna1-22/+33
2013-05-08merge: use help_unknown_ref()Libravatar Vikrant Varma1-1/+2
2013-04-05Merge branch 'sg/gpg-sig'Libravatar Junio C Hamano1-1/+36
2013-04-05Merge branch 'jc/merge-tag-object'Libravatar Junio C Hamano1-0/+13