Merge branch 'rs/sha1-file-plug-fallback-base-leak'
[gitweb.git] / builtin / merge-index.c
2017-03-10 Merge branch 'rs/sha1-file-plug-fallback-base-leak'
2017-03-10 Merge branch 'rs/commit-parsing-optim'
2017-03-10 Merge branch 'jk/t6300-cleanup'
2017-03-10 Merge branch 'jk/parse-config-key-cleanup'
2017-03-10 Merge branch 'sb/parse-hide-refs-config-cleanup'
2017-03-10 Merge branch 'jt/upload-pack-error-report'
2017-03-10 Merge branch 'jk/ident-empty'
2017-03-10 Merge branch 'jc/config-case-cmdline-take-2'
2017-02-27 Merge branch 'rl/remote-allow-missing-branch-name-merge'
2017-02-27 Merge branch 'jk/tempfile-ferror-fclose-confusion'
2017-02-27 Merge branch 'vn/xdiff-func-context'
2017-02-27 Merge branch 'mm/two-more-xstrfmt'
2017-02-27 Merge branch 'nd/clean-preserve-errno-in-warning'
2017-02-27 Merge branch 'jk/show-branch-lift-name-len-limit'
2017-02-27 Merge branch 'jn/remote-helpers-with-git-dir'
2017-02-27 Merge branch 'dt/gc-ignore-old-gc-logs'
2017-02-27 Merge branch 'jh/preload-index-skip-skip'
2017-02-27 Merge branch 'mh/submodule-hash'
2017-02-27 Merge branch 'sf/putty-w-args'
2017-02-27 Merge branch 'bw/attr'
2017-02-27 Merge branch 'cw/tag-reflog-message'
2017-02-27 Merge branch 'kn/ref-filter-branch-list'
2017-02-27 Merge branch 'ps/urlmatch-wildcard'
2017-02-27 Merge branch 'mm/merge-rename-delete-message'
2017-02-27 Merge branch 'mh/ref-remove-empty-directory'
2017-02-27 Merge branch 'jk/delta-chain-limit'
2017-02-27 Merge branch 'jk/describe-omit-some-refs'
2017-02-24 Merge branch 'ps/doc-gc-aggressive-depth-update'
2017-02-24 Merge branch 'bc/worktree-doc-fix-detached'
2017-02-24 Merge branch 'dr/doc-check-ref-format-normalize'
2017-02-24 Merge branch 'gp/document-dotfiles-in-templates-are...
2017-02-24 Merge branch 'rt/align-add-i-help-text'
2017-02-24 Merge branch 'bc/blame-doc-fix'
2017-02-21 Merge branch 'svn-escape-backslash' of git://bogomips...
2017-02-16 Merge branch 'jk/tempfile-ferror-fclose-confusion'
2017-02-16 Merge branch 'dp/submodule-doc-markup-fix'
2017-02-16 Merge branch 'js/mingw-isatty'
2017-02-16 Merge branch 'rs/strbuf-cleanup-in-rmdir-recursively'
2017-02-16 Merge branch 'rs/ls-files-partial-optim'
2017-02-16 Merge branch 'rs/cocci-check-free-only-null'
2017-02-16 Merge branch 'ls/p4-path-encoding'
2017-02-15 Merge branch 'tg/stash-doc-cleanup'
2017-02-15 Merge branch 'jk/doc-submodule-markup-fix'
2017-02-15 Merge branch 'jk/doc-remote-helpers-markup-fix'
2017-02-15 Merge branch 'sb/doc-unify-bottom'
2017-02-15 Merge branch 'rs/swap'
2017-02-15 Merge branch 'sb/submodule-doc'
2017-02-10 Merge branch 'nd/rev-list-all-includes-HEAD-doc'
2017-02-10 Merge branch 'jk/log-graph-name-only'
2017-02-10 Merge branch 'da/t7800-cleanup'
2017-02-10 Merge branch 'js/difftool-builtin'
2017-02-10 Merge branch 'rs/p5302-create-repositories-before-tests'
2017-02-10 Merge branch 'ps/worktree-prune-help-fix'
2017-02-10 Merge branch 'ew/complete-svn-authorship-options'
2017-02-10 Merge branch 'bw/push-submodule-only'
2017-02-08 Merge branch 'da/difftool-dir-diff-fix' into da/t7800...
2017-02-04 Merge branch 'master' of git://github.com/git-l10n...
2017-02-03 Merge branch 'cw/log-updates-for-all-refs-really'
2017-02-03 Merge branch 'pl/complete-diff-submodule-diff'
2017-02-03 Merge branch 'rs/object-id'
2017-02-03 Merge branch 'sb/submodule-update-initial-runs-custom...
2017-02-02 Merge branch 'nd/log-graph-configurable-colors'
2017-02-02 Merge branch 'mm/reset-facl-before-umask-test'
2017-02-02 Merge branch 'rs/absolute-pathdup'
2017-02-02 Merge branch 'js/status-pre-rebase-i'
2017-02-02 Merge branch 'ws/request-pull-code-cleanup' into maint
2017-01-31 Merge branch 'js/mingw-isatty' into maint
2017-01-31 Merge branch 'ad/bisect-terms' into maint
2017-01-31 Merge branch 'jk/grep-e-could-be-extended-beyond-posix...
2017-01-31 Merge branch 'km/branch-get-push-while-detached' into...
2017-01-31 Merge branch 'jk/rebase-i-squash-count-fix' into maint
2017-01-31 Merge branch 'jk/blame-fixes' into maint
2017-01-31 Merge branch 'jk/archive-zip-userdiff-config' into...
2017-01-31 Merge branch 'dt/disable-bitmap-in-auto-gc' into maint
2017-01-31 Merge branch 'nd/config-misc-fixes' into maint
2017-01-31 Merge branch 'jc/latin-1' into maint
2017-01-31 Merge branch 'js/remote-rename-with-half-configured...
2017-01-31 Merge branch 'js/mingw-isatty'
2017-01-31 Merge branch 'jk/vreport-sanitize'
2017-01-30 use oid_to_hex_r() for converting struct object_id...
2017-01-23 Merge branch 'ws/request-pull-code-cleanup'
2017-01-23 Merge branch 'ad/bisect-terms'
2017-01-23 Merge branch 'jk/grep-e-could-be-extended-beyond-posix'
2017-01-18 Merge branch 'sb/remove-gitview'
2017-01-18 Merge branch 'km/branch-get-push-while-detached'
2017-01-18 Merge branch 'jk/rebase-i-squash-count-fix'
2017-01-18 Merge branch 'jk/blame-fixes'
2017-01-18 Merge branch 'jk/archive-zip-userdiff-config'
2017-01-18 Merge branch 'dt/disable-bitmap-in-auto-gc'
2017-01-18 Merge git://ozlabs.org/~paulus/gitk
2017-01-17 Merge branch 'mm/gc-safety-doc' into maint
2017-01-17 Merge branch 'mm/push-social-engineering-attack-doc...
2017-01-17 Merge branch 'jt/fetch-no-redundant-tag-fetch-map'...
2017-01-17 Merge branch 'ls/filter-process' into maint
2017-01-17 Merge branch 'kh/tutorial-grammofix' into maint
2017-01-17 Merge branch 'lr/doc-fix-cet' into maint
2017-01-17 Merge branch 'sb/t3600-cleanup' into maint
2017-01-17 Merge branch 'jk/readme-gmane-is-no-more' into maint
2017-01-17 Merge branch 'sb/unpack-trees-grammofix' into maint
2017-01-17 Merge branch 'ak/lazy-prereq-mktemp' into maint
next