summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-2/+2
* Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\
| * config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-1/+1
|\ \
| * | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-051-1/+1
* | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-131-3/+1
|\ \ \ | |/ / |/| |
| * | use xfopen() in more placesNguyễn Thái Ngọc Duy2017-05-261-3/+1
| |/
* | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-3/+3
* | merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-081-2/+2
* | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-1/+1
|/
* Merge branch 'bc/object-id'Junio C Hamano2017-04-191-1/+1
|\
| * Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson2017-03-261-1/+1
* | Merge branch 'jc/merge-drop-old-syntax'Junio C Hamano2017-03-301-50/+9
|\ \ | |/ |/|
| * merge: drop 'git merge <message> HEAD <commit>' syntaxjc/merge-drop-old-syntaxJunio C Hamano2015-04-291-50/+9
* | Merge branch 'bc/object-id'Junio C Hamano2017-03-171-68/+66
|\ \
| * | builtin/merge: convert to struct object_idbrian m. carlson2017-02-221-68/+66
* | | Merge branch 'jk/interpret-branch-name'Junio C Hamano2017-03-141-1/+1
|\ \ \ | |/ / |/| |
| * | interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-021-1/+1
* | | Merge branch 'cp/merge-continue'Junio C Hamano2016-12-271-0/+25
|\ \ \
| * | | merge: mark usage error strings for translationcp/merge-continueJeff King2016-12-151-2/+2
| * | | merge: ensure '--abort' option takes no argumentsChris Packham2016-12-141-0/+4
| * | | merge: add '--continue' option as a synonym for 'git commit'Chris Packham2016-12-141-0/+21
| |/ /
* | | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-071-3/+3
|/ /
* | find_unique_abbrev: use 4-buffer ringJeff King2016-10-261-6/+5
* | 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