Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
merge-blobs.c: remove implicit dependency on the_index
[gitweb.git]
/
builtin
/
merge.c
2018-08-15
Merge branch 'es/diff-color-moved-fix'
blob
|
diff
|
raw
2018-08-15
Merge branch 'bw/protocol-v2'
blob
|
diff
|
raw
2018-08-15
Merge branch 'sg/travis-cocci-diagnose-failure'
blob
|
diff
|
raw
2018-08-15
Merge branch 'js/t7406-recursive-submodule-update-order...
blob
|
diff
|
raw
2018-08-15
Merge branch 'bw/fetch-pack-i18n'
blob
|
diff
|
raw
2018-08-15
Merge branch 'sg/fast-import-dump-refs-on-checkpoint...
blob
|
diff
|
raw
2018-08-15
Merge branch 'sb/trailers-docfix'
blob
|
diff
|
raw
2018-08-15
Merge branch 'jk/ui-color-always-to-auto'
blob
|
diff
|
raw
2018-08-02
Merge branch 'jt/commit-graph-per-object-store'
blob
|
diff
|
raw
2018-08-02
Merge branch 'es/chain-lint-in-subshell'
blob
|
diff
|
raw
2018-08-02
Merge branch 'jt/tags-to-promised-blobs-fix'
blob
|
diff
|
raw
2018-08-02
Merge branch 'jt/fetch-negotiator-skipping'
blob
|
diff
|
raw
2018-08-02
Merge branch 'jm/send-email-tls-auth-on-batch'
blob
|
diff
|
raw
2018-08-02
Merge branch 'bc/sequencer-export-work-tree-as-well'
blob
|
diff
|
raw
2018-08-02
Merge branch 'en/t7405-recursive-submodule-conflicts'
blob
|
diff
|
raw
2018-08-02
Merge branch 'en/t6036-merge-recursive-tests'
blob
|
diff
|
raw
2018-08-02
Merge branch 'en/dirty-merge-fixes'
blob
|
diff
|
raw
2018-08-02
Merge branch 'js/rebase-merge-octopus'
blob
|
diff
|
raw
2018-08-02
Merge branch 'tb/grep-only-matching'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'kg/gc-auto-windows-workaround'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'jm/cache-entry-from-mem-pool'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'jt/fetch-nego-tip'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'en/t6042-insane-merge-rename-testcases'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'sb/object-store-lookup'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'is/parsing-line-range'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'jt/fetch-pack-negotiator'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'ab/checkout-default-remote'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'sb/diff-color-move-more'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'es/test-fixes'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'ds/commit-graph-fsck'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'jk/fsck-gitmodules-gently'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'bc/object-id'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'en/t6036-recursive-corner-cases'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'sg/httpd-test-unflake'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'bp/test-drop-caches-for-windows'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'jk/has-uncommitted-changes-fix'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'as/sequencer-customizable-comment-char'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'sb/blame-color'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'nd/command-list'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'es/test-lint-one-shot-export'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'wc/find-commit-with-pattern-on-detached...
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'jc/t3404-one-shot-export-fix'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'mk/merge-in-sparse-checkout'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'hs/push-cert-check-cleanup'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'jk/empty-pick-fix'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'bp/log-ref-write-fd-with-strbuf'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'jt/partial-clone-fsck-connectivity'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'bc/send-email-auto-cte'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'bb/unicode-11-width'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'bb/pedantic'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'tb/config-default'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'mh/fast-import-no-diff-delta-empty'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'kn/userdiff-php'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'jk/fetch-all-peeled-fix'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'ag/rebase-p'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'jt/connectivity-check-after-unshallow'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'jk/for-each-ref-icase'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'en/t5407-rebase-m-fix'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'en/apply-comment-fix'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'en/rebase-consistency'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'sb/submodule-move-head-error-msg'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'rj/submodule-fsck-skip'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'sb/blame-color' into jk/banned-function
blob
|
diff
|
raw
|
diff to current
2018-07-23
Update messages in preparation for i18n
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'js/enhanced-version-info'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'sb/mailmap'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'ms/core-icase-doc'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'ds/commit-graph'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'tz/exclude-doc-smallfixes'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'js/rebase-recreate-merge'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'en/rebase-i-microfixes'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'mb/filter-branch-optim'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'dj/runtime-prefix'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'ao/config-from-gitmodules'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'jk/branch-l-0-deprecation'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'tb/grep-column'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'vs/typofixes'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'bw/protocol-v2'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'jt/remove-pack-bitmap-global'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'bw/config-refer-to-gitsubmodules-doc'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'xy/format-patch-prereq-patch-id-fix'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'pw/rebase-i-keep-reword-after-conflict'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'ld/p423'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'ds/ewah-cleanup'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'sb/submodule-core-worktree'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'sb/object-store-grafts'
blob
|
diff
|
raw
|
diff to current
2018-07-18
Merge branch 'en/merge-recursive-cleanup'
blob
|
diff
|
raw
|
diff to current
2018-07-17
Merge branch 'ds/commit-graph-fsck' into jt/commit...
blob
|
diff
|
raw
|
diff to current
2018-07-16
Merge branch 'jc/t3404-one-shot-export-fix' into es...
blob
|
diff
|
raw
|
diff to current
2018-07-16
builtin/merge: switch to use the_hash_algo
blob
|
diff
|
raw
|
diff to current
2018-07-11
merge: allow reading the merge commit message from...
blob
|
diff
|
raw
|
diff to current
2018-06-29
Merge branch 'sb/object-store-grafts' into sb/object...
blob
|
diff
|
raw
|
diff to current
2018-06-28
Merge branch 'sb/fix-fetching-moved-submodules'
blob
|
diff
|
raw
|
diff to current
2018-06-28
Merge branch 'tz/cred-netrc-cleanup'
blob
|
diff
|
raw
|
diff to current
2018-06-28
Merge branch 'jc/clean-after-sanity-tests'
blob
|
diff
|
raw
|
diff to current
2018-06-28
Merge branch 'nd/completion-negation'
blob
|
diff
|
raw
|
diff to current
2018-06-28
Merge branch 'pw/add-p-recount'
blob
|
diff
|
raw
|
diff to current
2018-06-28
Merge branch 'jk/fetch-all-peeled-fix'
blob
|
diff
|
raw
|
diff to current
2018-06-28
Merge branch 'ms/send-pack-honor-config'
blob
|
diff
|
raw
|
diff to current
2018-06-28
Merge branch 'jh/partial-clone'
blob
|
diff
|
raw
|
diff to current
next