Merge branch 'jk/notes-merge-config'
[gitweb.git] / merge-blobs.c
2015-08-31 Merge branch 'jk/fix-alias-pager-config-key-warnings'
2015-08-28 Merge branch 'cc/trailers-corner-case-fix'
2015-08-26 Merge branch 'as/docfix-reflog-expire-unreachable'
2015-08-26 Merge branch 'sg/t3020-typofix'
2015-08-25 Merge branch 'jk/test-with-x' into maint
2015-08-25 Merge branch 'sb/check-return-from-read-ref' into maint
2015-08-25 Merge branch 'cb/open-noatime-clear-errno'
2015-08-25 Merge branch 'dt/notes-multiple'
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 'jk/test-with-x'
2015-08-19 Merge branch 'sb/check-return-from-read-ref'
2015-08-19 Merge branch 'ta/docfix-index-format-tech' into maint
2015-08-19 Merge branch 'sb/remove-unused-var-from-builtin-add...
2015-08-19 Merge branch 'kn/tag-doc-fix' into maint
2015-08-19 Merge branch 'es/doc-clean-outdated-tools' into maint
2015-08-19 Merge branch 'nd/export-worktree' into maint
2015-08-19 Merge branch 'se/doc-checkout-ours-theirs' into maint
2015-08-19 Merge branch 'cb/uname-in-untracked' into maint
2015-08-19 Merge branch 'as/sparse-checkout-removal' into maint
2015-08-19 Merge branch 'jx/do-not-crash-receive-pack-wo-head...
2015-08-17 Merge branch 'ta/docfix-index-format-tech'
2015-08-17 Merge branch 'mh/get-remote-group-fix'
2015-08-12 Merge branch 'sb/remove-unused-var-from-builtin-add'
2015-08-12 Merge branch 'dt/unpack-trees-cache-tree-revalidate'
2015-08-12 Merge branch 'es/worktree-add-cleanup'
2015-08-12 Merge branch 'es/worktree-add'
2015-08-03 Merge branch 'es/doc-clean-outdated-tools'
2015-08-03 Merge branch 'jx/do-not-crash-receive-pack-wo-head'
2015-08-03 Merge branch 'as/sparse-checkout-removal'
2015-08-03 Merge branch 'cb/uname-in-untracked'
2015-08-03 Merge branch 'se/doc-checkout-ours-theirs'
2015-08-03 Merge branch 'kn/tag-doc-fix'
2015-08-03 Merge branch 'jc/commit-slab'
2015-08-03 Merge branch 'nd/export-worktree'
2015-08-03 Merge branch 'js/rebase-i-clean-up-upon-continue-to...
2015-08-03 Merge branch 'sg/completion-commit-cleanup' into maint
2015-08-03 Merge branch 'pt/am-abort-fix' into maint
2015-08-03 Merge branch 'mh/reporting-broken-refs-from-for-each...
2015-08-03 Merge branch 'sg/commit-cleanup-scissors' into maint
2015-07-27 Merge branch 'jk/pretty-encoding-doc' into maint
2015-07-27 Merge branch 'mm/branch-doc-updates' into maint
2015-07-27 Merge branch 'jc/fsck-retire-require-eoh' into maint
2015-07-27 Merge branch 'jc/unexport-git-pager-in-use-in-pager...
2015-07-27 Merge branch 'jk/rev-list-no-bitmap-while-pruning'...
2015-07-27 Merge branch 'rh/test-color-avoid-terminfo-in-original...
2015-07-27 Merge branch 'jk/fix-refresh-utime' into maint
2015-07-27 Merge branch 'cb/rebase-am-exit-code' into maint
2015-07-27 Merge branch 'jk/index-pack-reduce-recheck' into maint
2015-07-21 Merge branch 'tf/gitweb-typofix'
2015-07-17 Merge branch 'jk/still-interesting'
2015-07-17 Merge branch 'es/worktree-add'
2015-07-15 Merge branch 'jc/diff-ws-error-highlight'
2015-07-15 Merge branch 'mm/describe-doc' into maint
2015-07-15 Merge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15 Merge branch 'es/osx-header-pollutes-mask-macro' into...
2015-07-15 Merge branch 'es/utf8-stupid-compiler-workaround' into...
2015-07-15 Merge branch 'fk/doc-format-patch-vn' into maint
2015-07-15 Merge branch 'pt/t0302-needs-sanity' into maint
2015-07-15 Merge branch 'me/fetch-into-shallow-safety' into maint
2015-07-15 Merge branch 'af/tcsh-completion-noclobber' into maint
2015-07-15 Merge branch 'pa/auto-gc-mac-osx' into maint
2015-07-15 Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks...
2015-07-13 Merge branch 'es/worktree-add'
2015-07-13 Merge branch 'nd/multiple-work-trees'
2015-07-13 Merge branch 'jc/unexport-git-pager-in-use-in-pager'
2015-07-13 Merge branch 'js/rebase-i-clean-up-upon-continue-to...
2015-07-13 Merge branch 'jc/fsck-retire-require-eoh'
2015-07-10 Merge branch 'cb/rebase-am-exit-code'
2015-07-10 Merge branch 'jk/fix-refresh-utime'
2015-07-10 Merge branch 'mm/branch-doc-updates'
2015-07-10 Merge branch 'jk/rev-list-no-bitmap-while-pruning'
2015-07-10 Merge branch 'rh/test-color-avoid-terminfo-in-original...
2015-07-10 Merge branch 'jk/pretty-encoding-doc'
2015-07-09 Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'
2015-07-01 Merge branch 'me/fetch-into-shallow-safety'
2015-07-01 Merge branch 'jc/prompt-document-ps1-state-separator'
2015-07-01 Merge branch 'mm/describe-doc'
2015-06-26 Merge branch 'jk/stash-require-clean-index' into maint
2015-06-26 Merge branch 'cb/array-size' into maint
2015-06-25 Merge branch 'cn/cvsimport-perl-update'
2015-06-25 Merge branch 'cb/array-size'
2015-06-25 Merge branch 'sg/merge-summary-config' into maint
2015-06-25 Merge branch 'jk/make-fix-dependencies' into maint
2015-06-25 Merge branch 'sb/pack-protocol-mention-smart-http'...
2015-06-25 Merge branch 'jk/die-on-bogus-worktree-late' into maint
2015-06-25 Merge branch 'jk/color-diff-plain-is-context' into...
2015-06-25 Merge branch 'jk/diagnose-config-mmap-failure' into...
2015-06-25 Merge branch 'jk/squelch-missing-link-warning-for-unrea...
2015-06-25 Merge branch 'mm/rebase-i-post-rewrite-exec' into maint
2015-06-25 Merge branch 'nd/diff-i-t-a'
2015-06-24 Merge branch 'jk/stash-require-clean-index'
2015-06-24 Merge branch 'pa/auto-gc-mac-osx'
2015-06-24 Merge branch 'pt/t0302-needs-sanity'
2015-06-24 Merge branch 'fk/doc-format-patch-vn'
2015-06-24 Merge branch 'sg/commit-cleanup-scissors'
2015-06-24 Merge branch 'jk/index-pack-reduce-recheck'
2015-06-24 Merge branch 'af/tcsh-completion-noclobber'
2015-06-24 Merge branch 'mh/reporting-broken-refs-from-for-each...
2015-06-24 Merge branch 'sg/completion-commit-cleanup'
next