aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAge
* refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson2017-10-16
* refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-16
* refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-16
* Merge branch 'rs/strbuf-leakfix'Junio C Hamano2017-09-19
|\
| * merge: release strbuf after use in write_merge_heads()Rene Scharfe2017-09-07
| * merge: release strbuf after use in save_state()Rene Scharfe2017-09-07
* | Merge branch 'sb/merge-commit-msg-hook'Junio C Hamano2017-09-19
|\ \
| * | builtin/merge: honor commit-msg hook for mergesStefan Beller2017-09-08
| |/
* | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-10
|\ \ | |/ |/|
| * treewide: correct several "up-to-date" to "up to date"Martin Ågren2017-08-23
* | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-26
|\ \
| * | merge: save merge state earlierMichael J Gruber2017-08-23
| * | merge: split write_merge_state in twoMichael J Gruber2017-08-23
| * | merge: clarify call chainMichael J Gruber2017-08-23
| |/
* | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-26
|\ \
| * | pack: move pack-closing functionsJonathan Tan2017-08-23
* | | Merge branch 'lg/merge-signoff'Junio C Hamano2017-08-24
|\ \ \ | |/ / |/| |
| * | merge: add a --signoff flagŁukasz Gryglicki2017-07-25
| |/
* | Merge branch 'rs/merge-microcleanup'Junio C Hamano2017-08-22
|\ \
| * | merge: use skip_prefix()René Scharfe2017-08-10
* | | Merge branch 'ma/parse-maybe-bool'Junio C Hamano2017-08-22
|\ \ \
| * | | treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren2017-08-07
* | | | 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
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 15:25:29 +0000