summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-151-1/+1
* Merge branch 'rs/merge-add-strategies-simplification'Junio C Hamano2016-08-121-34/+10
|\
| * merge: use string_list_split() in add_strategies()rs/merge-add-strategies-simplificationRené Scharfe2016-08-051-34/+10
* | prepare the builtins for a libified merge_recursive()Johannes Schindelin2016-07-261-0/+2
* | Merge branch 'jk/write-file'Junio C Hamano2016-07-191-40/+5
|\ \
| * | use write_file_buf where applicableJeff King2016-07-081-40/+5
| |/
* | Merge branch 'bc/cocci'Junio C Hamano2016-07-191-8/+7
|\ \
| * | coccinelle: apply object_id Coccinelle transformationsbrian m. carlson2016-06-281-7/+6
| * | coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson2016-06-281-1/+1
| |/
* | i18n: merge: change command option help to lowercaseVasco Almeida2016-06-171-1/+1
* | i18n: merge: mark messages for translationVasco Almeida2016-06-171-5/+5
|/
* Merge branch 'en/merge-trivial-fix'Junio C Hamano2016-04-251-0/+8
|\
| * builtin/merge.c: fix a bug with trivial mergesen/merge-trivial-fixElijah Newren2016-04-121-0/+8
* | Merge branch 'dt/pre-refs-backend'Junio C Hamano2016-04-251-2/+2
|\ \ | |/ |/|
| * cmd_merge(): remove unneeded flag variableMichael Haggerty2016-04-101-2/+2
* | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-081-3/+9
|\ \
| * | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-231-3/+9
| |/
* | Merge branch 'jv/merge-nothing-into-void'Junio C Hamano2016-04-061-5/+5
|\ \
| * | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-voidJunio C Hamano2016-03-231-5/+5
| |/
* | Merge branch 'mm/diff-renames-default'Junio C Hamano2016-04-031-0/+1
|\ \ | |/ |/|
| * diff: activate diff.renames by defaultmm/diff-renames-defaultMatthieu Moy2016-02-251-0/+1
* | use st_add and st_mult for allocation size computationJeff King2016-02-221-1/+1
|/
* merge: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
* Remove get_object_hash.brian m. carlson2015-11-201-25/+25
* Convert struct object to object_idbrian m. carlson2015-11-201-5/+5
* Add several uses of get_object_hash.brian m. carlson2015-11-201-27/+27
* Merge branch 'rs/pop-commit'Junio C Hamano2015-10-301-7/+5
|\
| * use pop_commit() for consuming the first entry of a struct commit_listrs/pop-commitRené Scharfe2015-10-261-7/+5
* | Merge branch 'tk/stripspace'Junio C Hamano2015-10-261-1/+1
|\ \
| * | strbuf: make stripspace() part of strbufTobias Klauser2015-10-161-1/+1
* | | use sha1_to_hex_r() instead of strcpyJeff King2015-10-051-10/+10
|/ /
* | 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
View Lorry Controller Status