Andrew's git - gitweb.git/history

[gitweb.git] / ll-merge.c

2017-03-17	Merge branch 'jk/cherry-pick-0-mainline'	blob \| diff \| raw
2017-03-17	Merge branch 'js/early-config'	blob \| diff \| raw
2017-03-17	Merge branch 'bc/sha1-header-selection-with-cpp-macros'	blob \| diff \| raw
2017-03-17	Merge branch 'mg/status-porcelain-no-i18n'	blob \| diff \| raw
2017-03-17	Merge branch 'jk/add-i-use-pathspecs'	blob \| diff \| raw
2017-03-17	Merge branch 'jk/http-walker-buffer-underflow-fix'	blob \| diff \| raw
2017-03-17	Merge branch 'bc/object-id'	blob \| diff \| raw
2017-03-17	Merge branch 'rs/blame-code-cleanup'	blob \| diff \| raw
2017-03-17	Merge branch 'jk/interop-test'	blob \| diff \| raw
2017-03-17	Merge branch 'cc/split-index-config'	blob \| diff \| raw
2017-03-16	Sync with 'maint'	blob \| diff \| raw
2017-03-14	Merge branch 'kn/ref-filter-branch-list'	blob \| diff \| raw
2017-03-14	Merge branch 'jk/push-deadlock-regression-fix'	blob \| diff \| raw
2017-03-14	Merge branch 'js/travis-32bit-linux'	blob \| diff \| raw
2017-03-14	Merge branch 'ew/http-alternates-as-redirects-warning'	blob \| diff \| raw
2017-03-14	Merge branch 'dp/filter-branch-prune-empty'	blob \| diff \| raw
2017-03-14	Merge branch 'jt/perf-updates'	blob \| diff \| raw
2017-03-14	Merge branch 'mm/fetch-show-error-message-on-unadvertis...	blob \| diff \| raw
2017-03-14	Merge branch 'jk/interpret-branch-name'	blob \| diff \| raw
2017-03-14	Merge branch 'ab/cond-skip-tests'	blob \| diff \| raw
2017-03-13	Merge branch 'jc/diff-populate-filespec-size-only-fix'	blob \| diff \| raw
2017-03-13	Merge branch 'vn/line-log-memcpy-size-fix'	blob \| diff \| raw
2017-03-13	Merge branch 'jk/ewah-use-right-type-in-sizeof'	blob \| diff \| raw
2017-03-13	Merge branch 'ax/line-log-range-merge-fix'	blob \| diff \| raw
2017-03-13	Merge branch 'ss/remote-bzr-hg-placeholder-wo-python'	blob \| diff \| raw
2017-03-13	Merge branch 'js/realpath-pathdup-fix'	blob \| diff \| raw
2017-03-13	Merge branch 'jk/add-i-patch-do-prompt'	blob \| diff \| raw
2017-03-13	Merge branch 'jh/mingw-openssl-sha1'	blob \| diff \| raw
2017-03-10	Merge branch 'rs/log-email-subject'	blob \| diff \| raw
2017-03-10	Merge branch 'tg/stash-push'	blob \| diff \| raw
2017-03-10	Merge branch 'sb/submodule-init-url-selection'	blob \| diff \| raw
2017-03-10	Merge branch 'rj/remove-unused-mktemp'	blob \| diff \| raw
2017-03-10	Merge branch 'ew/markdown-url-in-readme'	blob \| diff \| raw
2017-03-10	Merge branch 'ps/docs-diffcore'	blob \| diff \| raw
2017-03-10	Merge branch 'jt/http-base-url-update-upon-redirect'	blob \| diff \| raw
2017-03-10	Merge branch 'jk/http-auth'	blob \| diff \| raw
2017-03-10	Merge branch 'jh/send-email-one-cc'	blob \| diff \| raw
2017-03-10	Merge branch 'rs/strbuf-add-real-path'	blob \| diff \| raw
2017-03-10	Merge branch 'rs/sha1-file-plug-fallback-base-leak'	blob \| diff \| raw
2017-03-10	Merge branch 'rs/commit-parsing-optim'	blob \| diff \| raw
2017-03-10	Merge branch 'jk/t6300-cleanup'	blob \| diff \| raw
2017-03-10	Merge branch 'jk/parse-config-key-cleanup'	blob \| diff \| raw
2017-03-10	Merge branch 'sb/parse-hide-refs-config-cleanup'	blob \| diff \| raw
2017-03-10	Merge branch 'jt/upload-pack-error-report'	blob \| diff \| raw
2017-03-10	Merge branch 'jk/ident-empty'	blob \| diff \| raw
2017-03-10	Merge branch 'jc/config-case-cmdline-take-2'	blob \| diff \| raw
2017-02-27	Merge branch 'rl/remote-allow-missing-branch-name-merge'	blob \| diff \| raw
2017-02-27	Merge branch 'km/delete-ref-reflog-message'	blob \| diff \| raw
2017-02-27	Merge branch 'jk/tempfile-ferror-fclose-confusion'	blob \| diff \| raw
2017-02-27	Merge branch 'vn/xdiff-func-context'	blob \| diff \| raw
2017-02-27	Merge branch 'js/git-path-in-subdir'	blob \| diff \| raw
2017-02-27	Merge branch 'mm/two-more-xstrfmt'	blob \| diff \| raw
2017-02-27	Merge branch 'nd/clean-preserve-errno-in-warning'	blob \| diff \| raw
2017-02-27	Merge branch 'jk/show-branch-lift-name-len-limit'	blob \| diff \| raw
2017-02-27	Merge branch 'jn/remote-helpers-with-git-dir'	blob \| diff \| raw
2017-02-27	Merge branch 'jk/grep-no-index-fix'	blob \| diff \| raw
2017-02-27	Merge branch 'dt/gc-ignore-old-gc-logs'	blob \| diff \| raw
2017-02-27	Merge branch 'jh/preload-index-skip-skip'	blob \| diff \| raw
2017-02-27	Merge branch 'mh/submodule-hash'	blob \| diff \| raw
2017-02-27	Merge branch 'sf/putty-w-args'	blob \| diff \| raw
2017-02-27	Merge branch 'js/rebase-helper'	blob \| diff \| raw
2017-02-27	Merge branch 'bw/attr'	blob \| diff \| raw
2017-02-24	Merge branch 'bc/worktree-doc-fix-detached'	blob \| diff \| raw \| diff to current
2017-02-24	Merge branch 'rt/align-add-i-help-text'	blob \| diff \| raw \| diff to current
2017-02-24	Merge branch 'bc/blame-doc-fix'	blob \| diff \| raw \| diff to current
2017-02-16	Merge branch 'ls/p4-path-encoding'	blob \| diff \| raw \| diff to current
2017-02-15	Merge branch 'sb/doc-unify-bottom'	blob \| diff \| raw \| diff to current
2017-02-10	Merge branch 'ps/worktree-prune-help-fix'	blob \| diff \| raw \| diff to current
2017-02-02	Merge branch 'mm/reset-facl-before-umask-test'	blob \| diff \| raw \| diff to current
2017-02-02	Merge branch 'ws/request-pull-code-cleanup' into maint	blob \| diff \| raw \| diff to current
2017-02-01	attr: convert git_check_attrs() callers to use the...	blob \| diff \| raw
2017-02-01	attr: rename function and struct related to checking...	blob \| diff \| raw \| diff to current
2017-01-31	Merge branch 'ad/bisect-terms' into maint	blob \| diff \| raw \| diff to current
2017-01-31	Merge branch 'jk/grep-e-could-be-extended-beyond-posix...	blob \| diff \| raw \| diff to current
2017-01-31	Merge branch 'km/branch-get-push-while-detached' into...	blob \| diff \| raw \| diff to current
2017-01-31	Merge branch 'jc/latin-1' into maint	blob \| diff \| raw \| diff to current
2017-01-31	Merge branch 'jk/vreport-sanitize'	blob \| diff \| raw \| diff to current
2017-01-23	Merge branch 'ws/request-pull-code-cleanup'	blob \| diff \| raw \| diff to current
2017-01-23	Merge branch 'ad/bisect-terms'	blob \| diff \| raw \| diff to current
2017-01-23	Merge branch 'jk/grep-e-could-be-extended-beyond-posix'	blob \| diff \| raw \| diff to current
2017-01-18	Merge branch 'sb/remove-gitview'	blob \| diff \| raw \| diff to current
2017-01-18	Merge branch 'km/branch-get-push-while-detached'	blob \| diff \| raw \| diff to current
2017-01-18	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2017-01-17	Merge branch 'mm/gc-safety-doc' into maint	blob \| diff \| raw \| diff to current
2017-01-17	Merge branch 'mm/push-social-engineering-attack-doc...	blob \| diff \| raw \| diff to current
2017-01-17	Merge branch 'jt/fetch-no-redundant-tag-fetch-map'...	blob \| diff \| raw \| diff to current
2017-01-17	Merge branch 'lr/doc-fix-cet' into maint	blob \| diff \| raw \| diff to current
2017-01-17	Merge branch 'sb/t3600-cleanup' into maint	blob \| diff \| raw \| diff to current
2017-01-17	Merge branch 'sb/unpack-trees-grammofix' into maint	blob \| diff \| raw \| diff to current
2017-01-17	Merge branch 'mk/mingw-winansi-ttyname-termination...	blob \| diff \| raw \| diff to current
2017-01-17	Merge branch 'jc/push-default-explicit' into maint	blob \| diff \| raw \| diff to current
2017-01-17	Merge branch 'jc/pull-rebase-ff' into maint	blob \| diff \| raw \| diff to current
2017-01-17	Merge branch 'jc/renormalize-merge-kill-safer-crlf...	blob \| diff \| raw \| diff to current
2017-01-17	Merge branch 'bb/unicode-9.0' into maint	blob \| diff \| raw \| diff to current
2017-01-10	Merge branch 'mm/gc-safety-doc'	blob \| diff \| raw \| diff to current
2017-01-10	Merge branch 'mm/push-social-engineering-attack-doc'	blob \| diff \| raw \| diff to current
2017-01-10	Merge branch 'jt/fetch-no-redundant-tag-fetch-map'	blob \| diff \| raw \| diff to current
2017-01-10	Merge branch 'jc/latin-1'	blob \| diff \| raw \| diff to current
2016-12-27	Merge branch 'ls/p4-lfs'	blob \| diff \| raw \| diff to current
2016-12-27	Merge branch 'mk/mingw-winansi-ttyname-termination...	blob \| diff \| raw \| diff to current
next