Merge branch 'jk/sanity'
[gitweb.git] / merge.c
2016-01-29 Merge branch 'jk/sanity'
2016-01-29 Merge branch 'jk/filter-branch-no-index'
2016-01-26 Merge branch 'jk/ok-to-fail-gc-auto-in-rebase'
2016-01-22 Merge branch 'rm/subtree-unwrap-tags'
2016-01-20 Merge branch 'tg/grep-no-index-fallback'
2016-01-20 Merge branch 'ho/gitweb-squelch-undef-warning'
2016-01-20 Merge branch 'js/fopen-harder'
2016-01-20 Merge branch 'ss/clone-depth-single-doc'
2016-01-20 Merge branch 'nd/exclusion-regression-fix'
2016-01-20 Merge branch 'dk/reflog-walk-with-non-commit'
2016-01-20 Merge branch 'sg/t6050-failing-editor-test-fix'
2016-01-20 Merge branch 'ew/for-each-ref-doc'
2016-01-20 Merge branch 'dw/signoff-doc'
2016-01-20 Merge branch 'jk/clang-pedantic'
2016-01-20 Merge branch 'ew/send-email-mutt-alias-fix'
2016-01-20 Merge branch 'ss/user-manual'
2016-01-20 Merge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-01-20 Merge branch 'nd/ita-cleanup'
2016-01-20 Merge branch 'nd/dir-exclude-cleanup'
2016-01-20 Merge branch 'jk/pack-revindex'
2016-01-12 Merge branch 'vl/grep-configurable-threads'
2016-01-12 Merge branch 'ea/blame-progress'
2016-01-12 Merge branch 'ep/make-phoney'
2016-01-12 Merge branch 'nd/stop-setenv-work-tree'
2016-01-04 Sync with 2.6.5
2016-01-04 Merge branch 'jk/pending-keep-tag-name' into maint
2015-12-28 Merge branch 'jk/pending-keep-tag-name'
2015-12-28 Merge branch 'jk/symbolic-ref-maint'
2015-12-22 Merge branch 'js/emu-write-epipe-on-windows'
2015-12-22 Merge branch 'nd/stop-setenv-work-tree' into nd/clear...
2015-12-21 Merge branch 'jk/ident-loosen-getpwuid'
2015-12-21 Merge branch 'jk/send-email-ssl-errors'
2015-12-21 Merge branch 'sg/completion-no-column'
2015-12-21 Merge branch 'mc/push-recurse-submodules-config'
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
2015-12-16 Merge branch 'fr/rebase-i-continue-preserve-options'
2015-12-16 Merge branch 'maint'
2015-12-15 Sync with maint
2015-12-15 Merge branch 'jk/send-email-complete-aliases'
2015-12-15 Merge branch 'ep/ident-with-getaddrinfo'
2015-12-15 Merge branch 'jk/prune-mtime' into maint
2015-12-15 Merge branch 'ls/p4-keep-empty-commits'
2015-12-15 Merge branch 'jk/prune-mtime'
2015-12-11 Merge branch 'maint'
2015-12-11 Merge branch 'sn/null-pointer-arith-in-mark-tree-uninte...
2015-12-11 Merge branch 'sb/doc-submodule-sync-recursive'
2015-12-11 Merge branch 'cb/t3404-shellquote'
2015-12-11 Merge branch 'sg/lock-file-commit-error'
2015-12-11 Merge branch 'master' of git://github.com/git-l10n...
2015-12-10 Sync with maint
2015-12-10 Merge branch 'nd/doc-check-ref-format-typo'
2015-12-10 Merge branch 'bc/object-id'
2015-12-01 Merge branch 'rc/configure-use-libs-when-checking-a...
2015-11-25 Merge branch 'rc/configure-use-libs-when-checking-a...
2015-11-20 Convert struct object to object_id
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-05 Merge branch 'jc/add-u-A-default-to-top' into maint
2015-11-04 Merge branch 'xf/user-manual-ff' into maint
2015-11-04 Merge branch 'xf/user-manual-markup' into maint
2015-11-04 Merge branch 'jc/everyday-markup' into maint
2015-11-03 Merge branch 'jk/merge-file-exit-code' into maint
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30 Merge branch 'jk/merge-file-exit-code'
2015-10-30 Merge branch 'xf/user-manual-ff'
2015-10-30 Merge branch 'jc/add-u-A-default-to-top'
2015-10-30 Merge git://ozlabs.org/~paulus/gitk
2015-10-29 Merge branch 'jc/everyday-markup'
2015-10-29 Merge branch 'xf/user-manual-markup'
2015-10-20 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16 Merge branch 'tk/doc-interpret-trailers-grammo' into...
2015-10-16 Merge branch 'jk/asciidoctor-section-heading-markup...
2015-10-16 Merge branch 'sb/http-flaky-test-fix' into maint
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-16 Merge branch 'jw/make-arflags-customizable' into maint
2015-10-15 Merge branch 'tk/doc-interpret-trailers-grammo'
2015-10-15 Merge branch 'sb/http-flaky-test-fix'
2015-10-14 Merge branch 'jk/asciidoctor-section-heading-markup...
2015-10-05 Merge branch 'jw/make-arflags-customizable'
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-09-17 Merge branch 'as/config-doc-markup-fix'
2015-09-17 Merge branch 'br/svn-doc-include-paths-config' into...
2015-09-17 Merge branch 'ah/submodule-typofix-in-error' into maint
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
2015-09-04 Merge branch 'jh/strbuf-read-use-read-in-full' into...
2015-09-02 Merge branch 'ee/clean-test-fixes'
2015-09-01 Merge branch 'ah/submodule-typofix-in-error'
2015-09-01 Merge branch 'ah/reflog-typofix-in-error'
2015-09-01 Merge branch 'ah/read-tree-usage-string'
2015-09-01 Merge branch 'ah/pack-objects-usage-strings'
2015-09-01 Merge branch 'br/svn-doc-include-paths-config'
2015-08-31 Merge branch 'sg/describe-contains'
2015-08-26 Merge branch 'sg/t3020-typofix'
2015-08-25 Merge branch 'jh/strbuf-read-use-read-in-full'
2015-08-19 Merge branch 'jc/finalize-temp-file'
2015-08-19 Merge branch 'sb/remove-unused-var-from-builtin-add...
next