summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
2016-04-25Merge branch 'en/merge-trivial-fix'Junio C Hamano
2016-04-25Merge branch 'dt/pre-refs-backend'Junio C Hamano
2016-04-13builtin/merge.c: fix a bug with trivial mergesElijah Newren
2016-04-10cmd_merge(): remove unneeded flag variableMichael Haggerty
2016-04-08Merge branch 'jc/merge-refuse-new-root'Junio C Hamano
2016-04-06Merge branch 'jv/merge-nothing-into-void'Junio C Hamano
2016-04-03Merge branch 'mm/diff-renames-default'Junio C Hamano
2016-03-23merge: refuse to create too cool a merge by defaultJunio C Hamano
2016-03-23merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano
2016-02-25diff: activate diff.renames by defaultMatthieu Moy
2016-02-22use st_add and st_mult for allocation size computationJeff King
2016-01-13merge: release pack files before garbage-collectingJohannes Schindelin
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Convert struct object to object_idbrian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-10-30Merge branch 'rs/pop-commit'Junio C Hamano
2015-10-26Merge branch 'tk/stripspace'Junio C Hamano
2015-10-26use pop_commit() for consuming the first entry of a struct commit_listRené Scharfe
2015-10-16strbuf: make stripspace() part of strbufTobias Klauser
2015-10-05use sha1_to_hex_r() instead of strcpyJeff King
2015-08-10memoize common git-path "constant" filesJeff King
2015-06-05Merge branch 'jk/at-push-sha1'Junio C Hamano
2015-05-21remote.c: drop "remote" pointer from "struct branch"Jeff King
2015-05-19Merge branch 'jc/merge'Junio C Hamano
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano
2015-04-29merge: handle FETCH_HEAD internallyJunio C Hamano
2015-04-29merge: decide if we auto-generate the message early in collect_parents()Junio C Hamano
2015-04-29merge: make collect_parents() auto-generate the merge messageJunio C Hamano
2015-04-29merge: extract prepare_merge_message() logic outJunio C Hamano
2015-04-29merge: narrow scope of merge_namesJunio C Hamano
2015-04-29merge: split reduce_parents() out of collect_parents()Junio C Hamano
2015-04-29merge: clarify collect_parents() logicJunio C Hamano
2015-04-29merge: small leakfix and code simplificationJunio C Hamano
2015-04-29merge: do not check argc to determine number of remote headsJunio C Hamano
2015-04-29merge: clarify "pulling into void" special caseJunio C Hamano
2015-04-29merge: simplify code flowJunio C Hamano
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-23 19:04:46 (GMT)