projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
merge-ort: implement handle_path_level_conflicts()
[git]
/
upload-pack.c
2021-01-07
Junio C Hamano
Merge branch 'en/merge-ort-3' into en/ort-directory...
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'es/perf-export-fix'
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'fc/t6030-bisect-reset-removes-auxiliary...
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'en/merge-ort-recursive'
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'fc/pull-merge-rebase'
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'en/merge-ort-2'
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'en/merge-ort-impl'
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'tb/pack-bitmap'
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'ab/trailers-extra-format'
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'pk/subsub-fetch-fix-take-2'
blob
|
commitdiff
|
raw
2020-12-27
Junio C Hamano
Merge branch 'pb/doc-git-linkit-fix'
blob
|
commitdiff
|
raw
2020-12-23
Junio C Hamano
Merge branch 'nk/refspecs-negative-fix'
blob
|
commitdiff
|
raw
2020-12-23
Junio C Hamano
Merge branch 'dl/checkout-p-merge-base'
blob
|
commitdiff
|
raw
2020-12-23
Junio C Hamano
Merge branch 'js/no-more-prepare-for-main-in-test'
blob
|
commitdiff
|
raw
2020-12-23
Junio C Hamano
Merge branch 'jx/pack-redundant-on-single-pack'
blob
|
commitdiff
|
raw
2020-12-20
Jiang Xin
Merge remote-tracking branch 'github/master' into git...
blob
|
commitdiff
|
raw
2020-12-18
Junio C Hamano
Merge branch 'jc/diff-I-status-fix'
blob
|
commitdiff
|
raw
2020-12-18
Junio C Hamano
Merge branch 'es/perf-export-fix'
blob
|
commitdiff
|
raw
2020-12-18
Junio C Hamano
Merge branch 'rb/nonstop-config-mak-uname-update'
blob
|
commitdiff
|
raw
2020-12-18
Junio C Hamano
Merge branch 'ab/unreachable-break'
blob
|
commitdiff
|
raw
2020-12-18
Junio C Hamano
Merge branch 'jc/strmap-remove-typefix'
blob
|
commitdiff
|
raw
2020-12-18
Junio C Hamano
Merge branch 'jc/compat-util-setitimer-fix'
blob
|
commitdiff
|
raw
2020-12-18
Junio C Hamano
Merge branch 'dd/doc-p4-requirements-update'
blob
|
commitdiff
|
raw
2020-12-18
Junio C Hamano
Merge branch 'js/init-defaultbranch-advice'
blob
|
commitdiff
|
raw
2020-12-18
Junio C Hamano
Merge https://github.com/prati0100/git-gui
blob
|
commitdiff
|
raw
2020-12-17
Junio C Hamano
Merge branch 'jh/index-v2-doc-on-fsmn'
blob
|
commitdiff
|
raw
2020-12-17
Junio C Hamano
Merge branch 'jb/midx-doc-update'
blob
|
commitdiff
|
raw
2020-12-17
Junio C Hamano
Merge branch 'rj/make-clean'
blob
|
commitdiff
|
raw
2020-12-17
Junio C Hamano
Merge branch 'js/t7064-master-to-initial'
blob
|
commitdiff
|
raw
2020-12-17
Junio C Hamano
Merge branch 'js/t6300-hardcode-main'
blob
|
commitdiff
|
raw
2020-12-17
Junio C Hamano
Merge branch 'jk/oid-array-cleanup'
blob
|
commitdiff
|
raw
2020-12-17
Junio C Hamano
Merge branch 'tb/partial-clone-filters-fix'
blob
|
commitdiff
|
raw
2020-12-17
Junio C Hamano
Merge branch 'js/t7900-protect-pwd-in-config-get'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'js/t5526-with-no-particular-primary-branc...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'js/cmake-extra-built-ins-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'da/vs-build-iconv-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'jk/multi-line-indent-style-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'jk/check-config-parsing-error-in-upload...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'ae/doc-reproducible-html'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'so/glossary-branch-is-not-necessarily...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'fc/atmark-in-refspec'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'dd/help-autocorrect-never'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'fc/zsh-completion'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'sn/config-doc-typofix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'fc/random-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'nm/imap-send-use-default-config'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'jk/banned'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'tb/bugreport-no-localtime'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'rs/maintenance-run-outside-repo'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'rs/fetch-pack-invalid-lockfile'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'nk/perf-fsmonitor-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'ma/grep-init-default'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'js/trace2-session-id'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'mt/do-not-use-scld-in-working-tree'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'ds/maintenance-part-3'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'ds/maintenance-part-2'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'ds/config-literal-value'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'ds/maintenance-part-1'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'tb/idx-midx-race-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'ps/update-ref-multi-transaction'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'js/add-i-color-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'jt/trace-error-on-warning'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Taylor Blau
upload-pack.c: don't free allowed_filters util pointers
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Jeff King
style: indent multiline "if" conditions to align
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Jeff King
upload-pack: propagate return value from object filter...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'pk/subsub-fetch-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'jk/stop-pack-objects-when-fetch-is-killed'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'jk/stop-pack-objects-when-push-is-killed'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'tb/repack-simplify'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'pb/pull-rebase-recurse-submodules'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'ab/retire-parse-remote'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-01
Jeff King
upload-pack: kill pack-objects helper on signal or...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'km/stash-error-message-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'hn/sleep-millisec-decl'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'na/notes-displayref-is-not-boolean'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'jc/do-not-just-explain-but-update-your...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'mt/worktree-error-message-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'ab/gc-keep-base-option'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'js/pull-rebase-use-advise'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'js/t4015-wo-master'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'js/t3040-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'js/t2106-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'sg/tests-prereq'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'rs/plug-diff-cache-leak'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'jc/ci-github-set-env'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'sg/t5310-jgit-wants-sha1'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'rs/archive-plug-leak-refname'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'ma/list-object-filter-opt-msgfix'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'pk/subsub-fetch-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'jk/4gb-idx'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'jx/t5411-flake-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'rs/hashwrite-be64'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'sg/bisect-approximately-halfway'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'fc/bash-completion-alias-of-alias'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Junio C Hamano
Merge branch 'pd/mergetool-nvimdiff'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Junio C Hamano
Merge branch 'ab/config-mak-uname-simplify'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Junio C Hamano
Merge branch 'en/strmap'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Junio C Hamano
Merge branch 'jk/diff-release-filespec-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Junio C Hamano
Merge branch 'jk/rev-parse-end-of-options'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Junio C Hamano
Merge branch 'jc/format-patch-name-max'
blob
|
commitdiff
|
raw
|
diff to current
next