path: root/builtin/merge.c
AgeCommit message (Expand)Author
2015-04-16Revert "merge: pass verbosity flag down to merge-recursive"Junio C Hamano
2015-04-14Merge branch 'jk/merge-quiet'Junio C Hamano
2015-04-02merge: pass verbosity flag down to merge-recursiveJeff King
2015-01-14standardize usage info string formatAlex Henrie
2015-01-12Merge branch 'rs/plug-strbuf-leak-in-merge'Junio C Hamano
2015-01-07Merge branch 'jc/merge-bases'Junio C Hamano
2014-12-29merge: release strbuf after use in suggest_conflicts()René Scharfe
2014-12-22Merge branch 'cc/interpret-trailers-more'Junio C Hamano
2014-11-10Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano
2014-10-30get_merge_bases(): always clean-up object flagsJunio C Hamano
2014-10-24merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano
2014-10-24builtin/merge.c: drop a parameter that is never usedJunio C Hamano
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty
2014-10-01try_merge_strategy(): use a statically-allocated lock_file objectMichael Haggerty
2014-10-01try_merge_strategy(): remove redundant lock_file allocationMichael Haggerty
2014-09-26Merge branch 'rs/realloc-array'Junio C Hamano
2014-09-19Merge branch 'ah/grammofix'Junio C Hamano
2014-09-18use REALLOC_ARRAY for changing the allocation size of arraysRené Scharfe
2014-09-02grammofix in user-facing messagesAlex Henrie
2014-08-20run-command: introduce CHILD_PROCESS_INITRené Scharfe
2014-07-16Merge branch 'rs/code-cleaning'Junio C Hamano
2014-07-16Merge branch 'nd/split-index'Junio C Hamano
2014-07-10merge: simplify merge_trivial() by using commit_list_append()René Scharfe
2014-07-10Merge branch 'mg/verify-commit'Junio C Hamano
2014-07-02Merge branch 'jk/commit-buffer-length'Junio C Hamano
2014-06-23gpg-interface: provide clear helper for struct signature_checkMichael J Gruber
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy
2014-06-12commit_tree: take a pointer/len pair rather than a const strbufJeff King
2014-06-03Merge branch 'fc/merge-default-to-upstream'Junio C Hamano
2014-06-03Merge branch 'mh/ref-transaction'Junio C Hamano
2014-04-22merge: enable defaulttoupstream by defaultFelipe Contreras
2014-04-08Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano
2014-04-07refs.h: rename the action_on_err constantsMichael Haggerty
2014-03-28Merge branch 'bp/commit-p-editor'Junio C Hamano
2014-03-24parse-options: multi-word argh should use dash to separate wordsJunio C Hamano
2014-03-18merge: fix GIT_EDITOR override for commit hookBenoit Pierre
2014-03-18commit: fix patch hunk editing with "commit -p -m"Benoit Pierre
2014-02-27Merge branch 'nv/commit-gpgsign-config'Junio C Hamano
2014-02-24commit-tree: add the commit.gpgsign option to sign all commitsNicolas Vigier
2014-01-27Merge branch 'ef/mingw-write'Junio C Hamano
2014-01-17prefer xwrite instead of writeErik Faye-Lund
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder
2013-10-31merge: simplify ff-only optionFelipe Contreras
2013-09-17Merge branch 'rh/ishes-doc'Junio C Hamano
2013-09-04use 'commit-ish' instead of 'committish'Richard Hansen
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano
2013-07-15Merge branch 'mv/merge-ff-tristate'Junio C Hamano
2013-07-12Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano