summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* memoize common git-path "constant" filesjk/git-pathJeff King2015-08-101-15/+15
* Merge branch 'jk/at-push-sha1'Junio C Hamano2015-06-051-1/+1
|\
| * remote.c: drop "remote" pointer from "struct branch"Jeff King2015-05-211-1/+1
* | Merge branch 'jc/merge'Junio C Hamano2015-05-191-87/+161
|\ \
| * | merge: deprecate 'git merge <message> HEAD <commit>' syntaxjc/mergeJunio C Hamano2015-04-291-0/+1
| * | merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-291-34/+72
| * | merge: decide if we auto-generate the message early in collect_parents()Junio C Hamano2015-04-291-7/+9
| * | merge: make collect_parents() auto-generate the merge messageJunio C Hamano2015-04-291-14/+22
| * | merge: extract prepare_merge_message() logic outJunio C Hamano2015-04-291-11/+15
| * | merge: narrow scope of merge_namesJunio C Hamano2015-04-291-4/+7
| * | merge: split reduce_parents() out of collect_parents()Junio C Hamano2015-04-291-16/+25
| * | merge: clarify collect_parents() logicJunio C Hamano2015-04-291-2/+11
| * | merge: small leakfix and code simplificationJunio C Hamano2015-04-291-2/+2
| * | merge: do not check argc to determine number of remote headsJunio C Hamano2015-04-291-3/+2
| * | merge: clarify "pulling into void" special caseJunio C Hamano2015-04-291-17/+18
| * | merge: simplify code flowJunio C Hamano2015-04-291-8/+8
* | | Revert "merge: pass verbosity flag down to merge-recursive"Junio C Hamano2015-04-161-4/+0
* | | Merge branch 'jk/merge-quiet'Junio C Hamano2015-04-141-0/+4
|\ \ \ | |_|/ |/| |
| * | merge: pass verbosity flag down to merge-recursiveJeff King2015-04-021-0/+4
* | | standardize usage info string formatAlex Henrie2015-01-141-2/+2
* | | Merge branch 'rs/plug-strbuf-leak-in-merge'Junio C Hamano2015-01-121-0/+1
|\ \ \
| * | | merge: release strbuf after use in suggest_conflicts()rs/plug-strbuf-leak-in-mergeRené Scharfe2014-12-291-0/+1
* | | | Merge branch 'jc/merge-bases'Junio C Hamano2015-01-071-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | get_merge_bases(): always clean-up object flagsjc/merge-basesJunio C Hamano2014-10-301-2/+2
| |/ /
* | | Merge branch 'cc/interpret-trailers-more'Junio C Hamano2014-12-221-15/+7
|\ \ \ | |_|/ |/| |
| * | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-101-15/+7
| |\ \
| | * | merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano2014-10-241-13/+5
| | * | builtin/merge.c: drop a parameter that is never usedJunio C Hamano2014-10-241-2/+2
* | | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-1/+1
* | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-0/+1
* | | | try_merge_strategy(): use a statically-allocated lock_file objectMichael Haggerty2014-10-011-7/+7
* | | | try_merge_strategy(): remove redundant lock_file allocationMichael Haggerty2014-10-011-1/+0
* | | | Merge branch 'rs/realloc-array'Junio C Hamano2014-09-261-1/+1
|\ \ \ \
| * | | | use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-arrayRené Scharfe2014-09-181-1/+1
| |/ / /
* | | | Merge branch 'ah/grammofix'Junio C Hamano2014-09-191-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | grammofix in user-facing messagesah/grammofixAlex Henrie2014-09-021-2/+2
* | | | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-201-2/+1
|/ / /
* | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-161-6/+4
|\ \ \
| * | | merge: simplify merge_trivial() by using commit_list_append()René Scharfe2014-07-101-6/+4
* | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-161-8/+4
|\ \ \ \
| * | | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-131-8/+4
* | | | | Merge branch 'mg/verify-commit'Junio C Hamano2014-07-101-4/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | gpg-interface: provide clear helper for struct signature_checkMichael J Gruber2014-06-231-4/+1
* | | | | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-021-4/+4
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | commit_tree: take a pointer/len pair rather than a const strbufJeff King2014-06-121-4/+4
| |/ /
* | | Merge branch 'fc/merge-default-to-upstream'Junio C Hamano2014-06-031-1/+1
|\ \ \
| * | | merge: enable defaulttoupstream by defaultfc/merge-default-to-upstreamFelipe Contreras2014-04-221-1/+1
| |/ /
* | | Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-031-3/+3
|\ \ \ | |/ / |/| |
| * | refs.h: rename the action_on_err constantsMichael Haggerty2014-04-071-3/+3
* | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-04-081-1/+1
|\ \ \ | |/ / |/| |
View Lorry Controller Status