projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅ next
merge-recursive: improve auto-merging messages with path collisions
[git]
/
t
/
t3035-merge-sparse.sh
2018-08-15
Junio C Hamano
Merge branch 'jk/banned-function'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'en/merge-recursive-skip-fix'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'jt/tag-following-with-proto-v2-fix'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'jk/size-t'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'sg/coccicheck-updates'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'sb/histogram-less-memory'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'nd/i18n'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'hs/gpgsm'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'bw/clone-ref-prefixes'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'jk/core-use-replace-refs'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'jh/json-writer'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'bb/make-developer-pedantic'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'es/diff-color-moved-fix'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'bw/protocol-v2'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'sg/travis-cocci-diagnose-failure'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'js/t7406-recursive-submodule-update-order...
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'bw/fetch-pack-i18n'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'sg/fast-import-dump-refs-on-checkpoint...
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'sb/trailers-docfix'
blob
|
commitdiff
|
raw
2018-08-15
Junio C Hamano
Merge branch 'jk/ui-color-always-to-auto'
blob
|
commitdiff
|
raw
2018-08-14
Junio C Hamano
Merge branch 'es/format-patch-interdiff' into es/format...
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'jt/commit-graph-per-object-store'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'es/chain-lint-in-subshell'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'jt/tags-to-promised-blobs-fix'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'jt/fetch-negotiator-skipping'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'jm/send-email-tls-auth-on-batch'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'bc/sequencer-export-work-tree-as-well'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'en/t7405-recursive-submodule-conflicts'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'en/t6036-merge-recursive-tests'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'en/dirty-merge-fixes'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'js/rebase-merge-octopus'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'tb/grep-only-matching'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'kg/gc-auto-windows-workaround'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'jm/cache-entry-from-mem-pool'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'jt/fetch-nego-tip'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'en/t6042-insane-merge-rename-testcases'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'sb/object-store-lookup'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'is/parsing-line-range'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'jt/fetch-pack-negotiator'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'ab/checkout-default-remote'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'sb/diff-color-move-more'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'es/test-fixes'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'ds/commit-graph-fsck'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'jk/fsck-gitmodules-gently'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'bc/object-id'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'en/t6036-recursive-corner-cases'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'sg/httpd-test-unflake'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'bp/test-drop-caches-for-windows'
blob
|
commitdiff
|
raw
2018-08-02
Junio C Hamano
Merge branch 'jk/has-uncommitted-changes-fix'
blob
|
commitdiff
|
raw
2018-07-24
Junio C Hamano
Merge branch 'as/sequencer-customizable-comment-char'
blob
|
commitdiff
|
raw
2018-07-24
Junio C Hamano
Merge branch 'sb/blame-color'
blob
|
commitdiff
|
raw
2018-07-24
Junio C Hamano
Merge branch 'nd/command-list'
blob
|
commitdiff
|
raw
2018-07-24
Junio C Hamano
Merge branch 'es/test-lint-one-shot-export'
blob
|
commitdiff
|
raw
2018-07-24
Junio C Hamano
Merge branch 'wc/find-commit-with-pattern-on-detached...
blob
|
commitdiff
|
raw
2018-07-24
Junio C Hamano
Merge branch 'jc/t3404-one-shot-export-fix'
blob
|
commitdiff
|
raw
2018-07-24
Junio C Hamano
Merge branch 'mk/merge-in-sparse-checkout'
blob
|
commitdiff
|
raw
2018-07-11
Max Kirillov
unpack-trees: do not fail reset because of unmerged...
blob
|
commitdiff
|
raw
projects / git / history
Junio C Hamano
Max Kirillov