summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* reduce_heads: fix memory leaksma/reduce-heads-leakfixMartin Ågren2017-11-081-0/+1
* Merge branch 'rs/strbuf-leakfix'Junio C Hamano2017-09-191-2/+7
|\
| * merge: release strbuf after use in write_merge_heads()Rene Scharfe2017-09-071-0/+1
| * merge: release strbuf after use in save_state()Rene Scharfe2017-09-071-2/+6
* | Merge branch 'sb/merge-commit-msg-hook'Junio C Hamano2017-09-191-0/+8
|\ \
| * | builtin/merge: honor commit-msg hook for mergesStefan Beller2017-09-081-0/+8
| |/
* | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-101-2/+2
|\ \ | |/ |/|
| * treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-2/+2
* | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-261-3/+12
|\ \
| * | merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-231-0/+2
| * | merge: split write_merge_state in twoMichael J Gruber2017-08-231-3/+8
| * | merge: clarify call chainMichael J Gruber2017-08-231-0/+2
| |/
* | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-261-0/+1
|\ \
| * | pack: move pack-closing functionsJonathan Tan2017-08-231-0/+1
* | | Merge branch 'lg/merge-signoff'Junio C Hamano2017-08-241-0/+4
|\ \ \ | |/ / |/| |
| * | merge: add a --signoff flaglg/merge-signoffŁukasz Gryglicki2017-07-251-0/+4
| |/
* | Merge branch 'rs/merge-microcleanup'Junio C Hamano2017-08-221-2/+2
|\ \
| * | merge: use skip_prefix()rs/merge-microcleanupRené Scharfe2017-08-101-2/+2
* | | Merge branch 'ma/parse-maybe-bool'Junio C Hamano2017-08-221-2/+2
|\ \ \
| * | | treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren2017-08-071-2/+2
* | | | use MOVE_ARRAYRené Scharfe2017-07-171-1/+1
| |_|/ |/| |
* | | 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
| |/ /
View Lorry Controller Status