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
2021-02-06
Merge branch 'so/log-diff-merge'
Junio C Hamano
2020-12-22
diff-merges: new function diff_merges_suppress()
Sergey Organov
2020-11-19
Merge branch 'en/merge-ort-api-null-impl'
Junio C Hamano
2020-11-03
merge,rebase,revert: select ort or recursive by config or environment
Elijah Newren
2020-10-20
Documentation: stylistically normalize references to Signed-off-by:
Bradley M. Kuhn
2020-09-26
Merge branch 'ds/maintenance-part-1'
Junio C Hamano
2020-09-17
maintenance: replace run_auto_gc()
Derrick Stolee
2020-09-09
Merge branch 'jt/interpret-branch-name-fallback'
Junio C Hamano
2020-09-03
wt-status: tolerate dangling marks
Jonathan Tan
2020-08-21
sequencer: treat CHERRY_PICK_HEAD as a pseudo ref
Han-Wen Nienhuys
2020-08-03
merge: make merge.renormalize work for all uses of merge machinery
Elijah Newren
2020-06-02
Merge branch 'an/merge-single-strategy-optim'
Junio C Hamano
2020-05-20
merge: optimization to skip evaluate_result for single strategy
Andrew Ng
2020-05-13
Merge branch 'jc/auto-gc-quiet'
Junio C Hamano
2020-05-07
auto-gc: pass --quiet down from am, commit, merge and rebase
Junio C Hamano
2020-05-06
Merge branch 'dl/opt-callback-cleanup'
Junio C Hamano
2020-05-01
Merge branch 'ds/blame-on-bloom'
Junio C Hamano
2020-04-30
Merge branch 'dl/merge-autostash'
Junio C Hamano
2020-04-28
Use OPT_CALLBACK and OPT_CALLBACK_F
Denton Liu
2020-04-17
tests: write commit-graph with Bloom filters
Derrick Stolee
2020-04-12
merge: use skip_prefix to parse config key
Martin Ågren
2020-04-10
merge: teach --autostash option
Denton Liu
2020-01-16
gpg-interface: add minTrustLevel as a configuration option
Hans Jerry Illikainen
2019-10-07
Merge branch 'tg/stash-refresh-index'
Junio C Hamano
2019-09-20
merge: use refresh_and_write_cache
Thomas Gummerer
2019-08-07
merge: --no-verify to bypass pre-merge-commit hook
Michael J Gruber
2019-08-07
git-merge: honor pre-merge-commit hook
Michael J Gruber
2019-08-07
merge: do no-verify like commit
Michael J Gruber
2019-07-19
Merge branch 'ea/merge-code-cleanup'
Junio C Hamano
2019-07-10
Merge branch 'ds/close-object-store'
Junio C Hamano
2019-07-09
builtin/merge.c - cleanup of code in for-cycle that tests strategies
Edmundo Carmona Antoranz
2019-06-17
Merge branch 'vv/merge-squash-with-explicit-commit'
Junio C Hamano
2019-06-13
Merge branch 'nd/merge-quit'
Junio C Hamano
2019-06-12
packfile: rename close_all_packs to close_object_store
Derrick Stolee
2019-05-28
merge: refuse --commit with --squash
Vishal Verma
2019-05-19
merge: add --quit
Nguyễn Thái Ngọc Duy
2019-05-13
merge: remove drop_save() in favor of remove_merge_branch_state()
Nguyễn Thái Ngọc Duy
2019-04-19
cherry-pick/revert: add scissors line on merge conflict
Denton Liu
2019-04-18
merge: add scissors line on merge conflict
Denton Liu
2019-04-18
merge: cleanup messages like commit
Denton Liu
2019-03-07
Merge branch 'nd/diff-parseopt'
Junio C Hamano
2019-01-28
parse-options: allow ll_callback with OPTION_CALLBACK
Nguyễn Thái Ngọc Duy
2019-01-28
parse-options: avoid magic return codes
Nguyễn Thái Ngọc Duy
2019-01-28
parse-options: stop abusing 'callback' for lowlevel callbacks
Nguyễn Thái Ngọc Duy
2019-01-24
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
Nguyễn Thái Ngọc Duy
2019-01-14
merge-recursive.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2019-01-05
Merge branch 'nd/the-index'
Junio C Hamano
2019-01-05
Merge branch 'nd/i18n'
Junio C Hamano
2018-11-18
Merge branch 'jk/verify-sig-merge-into-void'
Junio C Hamano
2018-11-12
sequencer.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
[next]