summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ / |/| |
| * | parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-241-1/+1
* | | Merge branch 'bp/commit-p-editor'Junio C Hamano2014-03-281-3/+3
|\ \ \ | |/ / |/| |
| * | merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-181-1/+1
| * | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-181-3/+3
* | | Merge branch 'nv/commit-gpgsign-config'Junio C Hamano2014-02-271-0/+3
|\ \ \ | |/ / |/| |
| * | commit-tree: add the commit.gpgsign option to sign all commitsNicolas Vigier2014-02-241-0/+3
* | | Merge branch 'ef/mingw-write'Junio C Hamano2014-01-271-1/+1
|\ \ \
| * | | prefer xwrite instead of writeErik Faye-Lund2014-01-171-1/+1
| | |/ | |/|
* | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-6/+6
|/ /
* | merge: simplify ff-only optionFelipe Contreras2013-10-311-9/+2
|/
* Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-171-1/+1
|\
| * use 'commit-ish' instead of 'committish'Richard Hansen2013-09-041-1/+1
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-6/+6
|/
* Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-221-1/+1
|\
| * Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-1/+1
* | Merge branch 'mv/merge-ff-tristate'Junio C Hamano2013-07-151-22/+33
|\ \
View Lorry Controller Status