summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* merge: fix swapped "up to date" message componentsJosh Soref2021-05-031-5/+9
* merge(s): apply consistent punctuation to "up to date" messagesEric Sunshine2021-05-031-1/+1
* use CALLOC_ARRAYRené Scharfe2021-03-131-1/+1
* Merge branch 'so/log-diff-merge'Junio C Hamano2021-02-051-1/+2
|\
| * diff-merges: new function diff_merges_suppress()Sergey Organov2020-12-211-1/+2
* | Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano2020-11-181-3/+23
|\ \
| * | merge,rebase,revert: select ort or recursive by config or environmentElijah Newren2020-11-021-3/+23
| |/
* | Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn2020-10-201-1/+1
|/
* Merge branch 'ds/maintenance-part-1'Junio C Hamano2020-09-251-1/+1
|\
| * maintenance: replace run_auto_gc()Derrick Stolee2020-09-171-1/+1
* | Merge branch 'jt/interpret-branch-name-fallback'Junio C Hamano2020-09-091-1/+1
|\ \
| * | wt-status: tolerate dangling marksJonathan Tan2020-09-021-1/+1
* | | sequencer: treat CHERRY_PICK_HEAD as a pseudo refHan-Wen Nienhuys2020-08-211-1/+1
| |/ |/|
* | merge: make merge.renormalize work for all uses of merge machineryElijah Newren2020-08-031-4/+0
|/
* Merge branch 'an/merge-single-strategy-optim'Junio C Hamano2020-06-021-1/+1
|\
| * merge: optimization to skip evaluate_result for single strategyAndrew Ng2020-05-191-1/+1
* | Merge branch 'jc/auto-gc-quiet'Junio C Hamano2020-05-131-2/+1
|\ \
| * | auto-gc: pass --quiet down from am, commit, merge and rebaseJunio C Hamano2020-05-071-2/+1
| |/
* | Merge branch 'dl/opt-callback-cleanup'Junio C Hamano2020-05-051-2/+2
|\ \
| * | Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu2020-04-281-2/+2
* | | Merge branch 'ds/blame-on-bloom'Junio C Hamano2020-05-011-2/+5
|\ \ \
| * | | tests: write commit-graph with Bloom filtersDerrick Stolee2020-04-161-2/+5
| | |/ | |/|
* | | Merge branch 'dl/merge-autostash'Junio C Hamano2020-04-291-0/+25
|\ \ \ | |_|/ |/| |
| * | merge: teach --autostash optionDenton Liu2020-04-101-0/+25
| |/
* | merge: use skip_prefix to parse config keyMartin Ågren2020-04-111-3/+5
|/
* gpg-interface: add minTrustLevel as a configuration optionHans Jerry Illikainen2020-01-151-2/+7
* Merge branch 'tg/stash-refresh-index'Junio C Hamano2019-10-071-10/+3
|\
| * merge: use refresh_and_write_cacheThomas Gummerer2019-09-201-10/+3
* | merge: --no-verify to bypass pre-merge-commit hookMichael J Gruber2019-08-071-2/+2
* | git-merge: honor pre-merge-commit hookMichael J Gruber2019-08-071-0/+12
* | merge: do no-verify like commitMichael J Gruber2019-08-071-3/+3
|/
* Merge branch 'ea/merge-code-cleanup'Junio C Hamano2019-07-191-33/+20
|\
| * builtin/merge.c - cleanup of code in for-cycle that tests strategiesEdmundo Carmona Antoranz2019-07-091-33/+20
* | Merge branch 'ds/close-object-store'Junio C Hamano2019-07-091-1/+1
|\ \ | |/ |/|
| * packfile: rename close_all_packs to close_object_storeDerrick Stolee2019-06-121-1/+1
* | Merge branch 'vv/merge-squash-with-explicit-commit'Junio C Hamano2019-06-171-1/+11
|\ \
| * | merge: refuse --commit with --squashVishal Verma2019-05-281-1/+11
| |/
* | Merge branch 'nd/merge-quit'Junio C Hamano2019-06-131-12/+18
|\ \
| * | merge: add --quitNguyễn Thái Ngọc Duy2019-05-191-0/+13
| * | merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy2019-05-131-12/+5
| |/
* | cherry-pick/revert: add scissors line on merge conflictDenton Liu2019-04-191-8/+2
* | merge: add scissors line on merge conflictDenton Liu2019-04-181-0/+14
* | merge: cleanup messages like commitDenton Liu2019-04-181-10/+31
* | Merge branch 'nd/diff-parseopt'Junio C Hamano2019-03-071-3/+6
|\ \ | |/ |/|
| * parse-options: allow ll_callback with OPTION_CALLBACKNguyễn Thái Ngọc Duy2019-01-271-0/+2
| * parse-options: avoid magic return codesNguyễn Thái Ngọc Duy2019-01-271-2/+3
| * parse-options: stop abusing 'callback' for lowlevel callbacksNguyễn Thái Ngọc Duy2019-01-271-1/+1
* | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-0/+1
* | merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2019-01-141-1/+1
|/
* Merge branch 'nd/the-index'Junio C Hamano2019-01-041-1/+1
|\
View Lorry Controller Status