aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAge
* merge: release pack files before garbage-collectingJohannes Schindelin2016-01-13
* Remove get_object_hash.brian m. carlson2015-11-20
* Convert struct object to object_idbrian m. carlson2015-11-20
* Add several uses of get_object_hash.brian m. carlson2015-11-20
* Merge branch 'rs/pop-commit'Junio C Hamano2015-10-30
|\
| * use pop_commit() for consuming the first entry of a struct commit_listRené Scharfe2015-10-26
* | Merge branch 'tk/stripspace'Junio C Hamano2015-10-26
|\ \
| * | strbuf: make stripspace() part of strbufTobias Klauser2015-10-16
* | | use sha1_to_hex_r() instead of strcpyJeff King2015-10-05
|/ /
* | memoize common git-path "constant" filesJeff King2015-08-10
|/
* Merge branch 'jk/at-push-sha1'Junio C Hamano2015-06-05
|\
| * remote.c: drop "remote" pointer from "struct branch"Jeff King2015-05-21
* | Merge branch 'jc/merge'Junio C Hamano2015-05-19
|\ \
| * | merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano2015-04-29
| * | merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-29
| * | merge: decide if we auto-generate the message early in collect_parents()Junio C Hamano2015-04-29
| * | merge: make collect_parents() auto-generate the merge messageJunio C Hamano2015-04-29
| * | merge: extract prepare_merge_message() logic outJunio C Hamano2015-04-29
| * | merge: narrow scope of merge_namesJunio C Hamano2015-04-29
| * | merge: split reduce_parents() out of collect_parents()Junio C Hamano2015-04-29
| * | merge: clarify collect_parents() logicJunio C Hamano2015-04-29
| * | merge: small leakfix and code simplificationJunio C Hamano2015-04-29
| * | merge: do not check argc to determine number of remote headsJunio C Hamano2015-04-29
| * | merge: clarify "pulling into void" special caseJunio C Hamano2015-04-29
| * | merge: simplify code flowJunio C Hamano2015-04-29
* | | Revert "merge: pass verbosity flag down to merge-recursive"Junio C Hamano2015-04-16
* | | Merge branch 'jk/merge-quiet'Junio C Hamano2015-04-14
|\ \ \ | |_|/ |/| |
| * | merge: pass verbosity flag down to merge-recursiveJeff King2015-04-02
* | | standardize usage info string formatAlex Henrie2015-01-14
* | | Merge branch 'rs/plug-strbuf-leak-in-merge'Junio C Hamano2015-01-12
|\ \ \
| * | | merge: release strbuf after use in suggest_conflicts()René Scharfe2014-12-29
* | | | Merge branch 'jc/merge-bases'Junio C Hamano2015-01-07
|\ \ \ \ | |/ / / |/| | |
| * | | get_merge_bases(): always clean-up object flagsJunio C Hamano2014-10-30
| |/ /
* | | Merge branch 'cc/interpret-trailers-more'Junio C Hamano2014-12-22
|\ \ \ | |_|/ |/| |
| * | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-10
| |\ \
| | * | merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano2014-10-24
| | * | builtin/merge.c: drop a parameter that is never usedJunio C Hamano2014-10-24
* | | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-15
* | | | lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty2014-10-01
* | | | try_merge_strategy(): use a statically-allocated lock_file objectMichael Haggerty2014-10-01
* | | | try_merge_strategy(): remove redundant lock_file allocationMichael Haggerty2014-10-01
* | | | Merge branch 'rs/realloc-array'Junio C Hamano2014-09-26
|\ \ \ \
| * | | | use REALLOC_ARRAY for changing the allocation size of arraysRené Scharfe2014-09-18
| |/ / /
* | | | Merge branch 'ah/grammofix'Junio C Hamano2014-09-19
|\ \ \ \ | |/ / / |/| | |
| * | | grammofix in user-facing messagesAlex Henrie2014-09-02
* | | | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-20
|/ / /
* | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-16
|\ \ \
| * | | merge: simplify merge_trivial() by using commit_list_append()René Scharfe2014-07-10
* | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-16
|\ \ \ \
| * | | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-13
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-29 12:43:54 +0000