Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
/
merge.c
Age
Commit message (
Expand
)
Author
2022-09-01
Merge branch 'en/merge-multi-strategies'
Junio C Hamano
2022-09-01
Merge branch 'en/merge-unstash-only-on-clean-merge'
Junio C Hamano
2022-08-24
merge: small code readability improvement
Elijah Newren
2022-08-24
merge: cleanup confusing logic for handling successful merges
Elijah Newren
2022-08-24
merge: only apply autostash when appropriate
Elijah Newren
2022-07-23
merge: do not exit restore_state() prematurely
Elijah Newren
2022-07-23
merge: ensure we can actually restore pre-merge state
Elijah Newren
2022-07-23
merge: make restore_state() restore staged state too
Elijah Newren
2022-07-23
merge: fix save_state() to work when there are stat-dirty files
Elijah Newren
2022-07-23
merge: do not abort early if one strategy fails to handle the merge
Elijah Newren
2022-07-23
merge: abort if index does not match HEAD for trivial merges
Elijah Newren
2022-07-06
cocci: add and apply a rule to find "unused" strbufs
Ævar Arnfjörð Bjarmason
2022-04-14
revisions API users: add straightforward release_revisions()
Ævar Arnfjörð Bjarmason
2022-03-08
hooks: fix an obscure TOCTOU "did we just run a hook?" race
Ævar Arnfjörð Bjarmason
2022-03-08
merge: don't run post-hook logic on --no-verify
Ævar Arnfjörð Bjarmason
2022-02-19
Merge branch 'pw/use-in-process-checkout-in-rebase'
Junio C Hamano
2022-02-10
Merge branch 'en/plug-leaks-in-merge'
Junio C Hamano
2022-02-10
Merge branch 'ab/config-based-hooks-2'
Junio C Hamano
2022-01-26
create_autostash(): remove unneeded parameter
Phillip Wood
2022-01-22
merge: fix memory leaks in cmd_merge()
Elijah Newren
2022-01-10
Merge branch 'ja/i18n-similar-messages'
Junio C Hamano
2022-01-08
merge: convert post-merge to use hook.h
Emily Shaffer
2022-01-06
Merge branch 'jc/merge-detached-head-name'
Junio C Hamano
2022-01-06
i18n: turn "options are incompatible" into "cannot be used together"
Jean-Noël Avila
2021-12-21
merge: allow to pretend a merge is made into a different branch
Junio C Hamano
2021-11-26
run-command API users: use strvec_pushl(), not argv construction
Ævar Arnfjörð Bjarmason
2021-10-26
Merge branch 'ab/mark-leak-free-tests-more'
Junio C Hamano
2021-10-14
Merge branch 'ab/config-based-hooks-1'
Junio C Hamano
2021-10-14
Merge branch 'en/removing-untracked-fixes'
Junio C Hamano
2021-10-08
merge: add missing strbuf_release()
Ævar Arnfjörð Bjarmason
2021-09-27
Remove ignored files by default when they are in the way
Elijah Newren
2021-09-27
unpack-trees: introduce preserve_ignored to unpack_trees_options
Elijah Newren
2021-09-27
hook.c users: use "hook_exists()" instead of "find_hook()"
Ævar Arnfjörð Bjarmason
2021-09-27
hook.[ch]: move find_hook() from run-command.c to hook.c
Ævar Arnfjörð Bjarmason
2021-09-21
Merge branch 'js/run-command-close-packs'
Junio C Hamano
2021-09-21
Merge branch 'ds/mergies-with-sparse-index'
Junio C Hamano
2021-09-10
Merge branch 'ab/retire-advice-config'
Junio C Hamano
2021-09-10
merge: make sparse-aware with ORT
Derrick Stolee
2021-09-09
run_auto_maintenance(): implicitly close the object store
Johannes Schindelin
2021-09-08
Merge branch 'rs/xopen-reports-open-failures'
Junio C Hamano
2021-08-31
Merge branch 'cb/builtin-merge-format-string-fix'
Junio C Hamano
2021-08-31
Merge branch 'en/ort-becomes-the-default'
Junio C Hamano
2021-08-31
Merge branch 'en/merge-strategy-docs'
Junio C Hamano
2021-08-31
Merge branch 'en/pull-conflicting-options'
Junio C Hamano
2021-08-26
use xopen() to handle fatal open(2) failures
René Scharfe
2021-08-25
advice: remove read uses of most global `advice_` variables
Ben Boeckel
2021-08-09
builtin/merge: avoid -Wformat-extra-args from ancient Xcode
Carlo Marcelo Arenas Belón
2021-08-06
Change default merge backend from recursive to ort
Elijah Newren
2021-08-05
Update error message and code comment
Elijah Newren
2021-08-04
Merge branch 'pb/merge-autostash-more'
Junio C Hamano
[next]