aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAge
* use MOVE_ARRAYRené Scharfe2017-07-17
* Merge branch 'bw/config-h'Junio C Hamano2017-06-24
|\
| * config: don't include config.h by defaultBrandon Williams2017-06-15
* | Merge branch 'bw/object-id'Junio C Hamano2017-06-19
|\ \
| * | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-05
* | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-13
|\ \ \ | |/ / |/| |
| * | use xfopen() in more placesNguyễn Thái Ngọc Duy2017-05-26
| |/
* | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-08
* | merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-08
* | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-08
|/
* Merge branch 'bc/object-id'Junio C Hamano2017-04-19
|\
| * Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson2017-03-26
* | Merge branch 'jc/merge-drop-old-syntax'Junio C Hamano2017-03-30
|\ \ | |/ |/|
| * merge: drop 'git merge <message> HEAD <commit>' syntaxJunio C Hamano2015-04-29
* | Merge branch 'bc/object-id'Junio C Hamano2017-03-17
|\ \
| * | builtin/merge: convert to struct object_idbrian m. carlson2017-02-22
* | | Merge branch 'jk/interpret-branch-name'Junio C Hamano2017-03-14
|\ \ \ | |/ / |/| |
| * | interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-02
* | | Merge branch 'cp/merge-continue'Junio C Hamano2016-12-27
|\ \ \
| * | | merge: mark usage error strings for translationJeff King2016-12-15
| * | | merge: ensure '--abort' option takes no argumentsChris Packham2016-12-14
| * | | merge: add '--continue' option as a synonym for 'git commit'Chris Packham2016-12-14
| |/ /
* | | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-07
|/ /
* | find_unique_abbrev: use 4-buffer ringJeff King2016-10-26
* | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-15
* | Merge branch 'rs/merge-add-strategies-simplification'Junio C Hamano2016-08-12
|\ \
| * | merge: use string_list_split() in add_strategies()René Scharfe2016-08-05
* | | prepare the builtins for a libified merge_recursive()Johannes Schindelin2016-07-26
* | | Merge branch 'jk/write-file'Junio C Hamano2016-07-19
|\ \ \
| * | | use write_file_buf where applicableJeff King2016-07-08
| |/ /
* | | Merge branch 'bc/cocci'Junio C Hamano2016-07-19
|\ \ \
| * | | coccinelle: apply object_id Coccinelle transformationsbrian m. carlson2016-06-28
| * | | coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson2016-06-28
| |/ /
* | | i18n: merge: change command option help to lowercaseVasco Almeida2016-06-17
* | | i18n: merge: mark messages for translationVasco Almeida2016-06-17
|/ /
* | Merge branch 'en/merge-trivial-fix'Junio C Hamano2016-04-25
|\ \
| * | builtin/merge.c: fix a bug with trivial mergesElijah Newren2016-04-12
* | | Merge branch 'dt/pre-refs-backend'Junio C Hamano2016-04-25
|\ \ \ | |/ / |/| |
| * | cmd_merge(): remove unneeded flag variableMichael Haggerty2016-04-10
* | | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-08
|\ \ \
| * | | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-23
| |/ /
* | | Merge branch 'jv/merge-nothing-into-void'Junio C Hamano2016-04-06
|\ \ \
| * | | merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano2016-03-23
| |/ /
* | | Merge branch 'mm/diff-renames-default'Junio C Hamano2016-04-03
|\ \ \ | |/ / |/| |
| * | diff: activate diff.renames by defaultMatthieu Moy2016-02-25
* | | use st_add and st_mult for allocation size computationJeff King2016-02-22
|/ /
* | 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