summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
...
| * create_autostash(): remove unneeded parameterPhillip Wood2022-01-261-4/+2
* | Merge branch 'en/plug-leaks-in-merge'Junio C Hamano2022-02-091-1/+5
|\ \
| * | merge: fix memory leaks in cmd_merge()Elijah Newren2022-01-211-1/+5
* | | Merge branch 'ab/config-based-hooks-2'Junio C Hamano2022-02-091-1/+1
|\ \ \ | |/ / |/| |
| * | merge: convert post-merge to use hook.hEmily Shaffer2022-01-071-1/+1
* | | Merge branch 'ja/i18n-similar-messages'Junio C Hamano2022-01-101-2/+2
|\ \ \
| * | | i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila2022-01-051-2/+2
| |/ /
* | | Merge branch 'jc/merge-detached-head-name'Junio C Hamano2022-01-051-0/+4
|\ \ \ | |/ / |/| |
| * | merge: allow to pretend a merge is made into a different branchJunio C Hamano2021-12-201-0/+4
| |/
* | run-command API users: use strvec_pushl(), not argv constructionÆvar Arnfjörð Bjarmason2021-11-251-2/+1
|/
* Merge branch 'ab/mark-leak-free-tests-more'Junio C Hamano2021-10-251-0/+2
|\
| * merge: add missing strbuf_release()Ævar Arnfjörð Bjarmason2021-10-071-0/+2
* | Merge branch 'ab/config-based-hooks-1'Junio C Hamano2021-10-131-1/+2
|\ \
| * | hook.c users: use "hook_exists()" instead of "find_hook()"Ævar Arnfjörð Bjarmason2021-09-271-1/+1
| * | hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason2021-09-271-0/+1
| |/
* | Merge branch 'en/removing-untracked-fixes'Junio C Hamano2021-10-131-0/+1
|\ \ | |/ |/|
| * Remove ignored files by default when they are in the wayElijah Newren2021-09-271-2/+1
| * unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren2021-09-271-0/+2
* | Merge branch 'js/run-command-close-packs'Junio C Hamano2021-09-201-1/+0
|\ \
| * | run_auto_maintenance(): implicitly close the object storeJohannes Schindelin2021-09-091-1/+0
* | | Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano2021-09-201-0/+3
|\ \ \ | |_|/ |/| |
| * | merge: make sparse-aware with ORTDerrick Stolee2021-09-091-0/+3
| |/
* | Merge branch 'ab/retire-advice-config'Junio C Hamano2021-09-101-2/+2
|\ \
| * | advice: remove read uses of most global `advice_` variablesBen Boeckel2021-08-251-2/+2
| |/
* | Merge branch 'rs/xopen-reports-open-failures'Junio C Hamano2021-09-081-3/+1
|\ \
| * | use xopen() to handle fatal open(2) failuresRené Scharfe2021-08-251-3/+1
| |/
* | Merge branch 'cb/builtin-merge-format-string-fix'Junio C Hamano2021-08-301-3/+5
|\ \
| * | builtin/merge: avoid -Wformat-extra-args from ancient XcodeCarlo Marcelo Arenas Belón2021-08-091-3/+5
* | | Merge branch 'en/ort-becomes-the-default'Junio C Hamano2021-08-301-2/+8
|\ \ \
| * | | Change default merge backend from recursive to ortElijah Newren2021-08-051-2/+8
* | | | Merge branch 'en/merge-strategy-docs'Junio C Hamano2021-08-301-1/+1
|\ \ \ \ | |/ / /
| * | | Update error message and code commentElijah Newren2021-08-051-1/+1
* | | | Merge branch 'en/pull-conflicting-options'Junio C Hamano2021-08-301-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie2021-07-201-1/+1
| |/ /
* | | Merge branch 'pb/merge-autostash-more'Junio C Hamano2021-08-041-1/+3
|\ \ \
| * | | merge: apply autostash if merge strategy failsPhilippe Blain2021-07-231-0/+1
| * | | merge: apply autostash if fast-forward failsPhilippe Blain2021-07-231-0/+1
| * | | merge: add missing word "strategy" to a messagePhilippe Blain2021-07-231-1/+1
| |/ /
* | | builtin/merge: free found_ref when doneAndrzej Hunt2021-07-261-1/+2
|/ /
* | Merge branch 'ah/merge-usage-i18n-fix'Junio C Hamano2021-06-101-2/+2
|\ \
| * | merge: don't translate literal commandsAlex Henrie2021-05-161-2/+2
* | | 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
|\ \
View Lorry Controller Status