Merge branch 'ks/p4-view-spec'
[gitweb.git] / merge-recursive.c
2013-09-18 Merge branch 'ks/p4-view-spec'
2013-09-18 Merge branch 'jk/duplicate-objects-in-packs'
2013-09-18 Merge branch 'nd/git-dir-pointing-at-gitfile'
2013-09-18 Merge branch 'jk/pager-bypass-cat-for-default-pager'
2013-09-18 Merge branch 'fc/t3200-fixes'
2013-09-18 Merge branch 'fc/rev-parse-test-updates'
2013-09-17 Merge branch 'jk/remove-remote-helpers-in-python'
2013-09-17 Merge branch 'ss/doclinks'
2013-09-17 Merge branch 'rh/ishes-doc'
2013-09-17 Merge branch 'dw/diff-no-index-doc'
2013-09-17 Merge branch 'ta/user-manual'
2013-09-17 Merge branch 'fc/trivial'
2013-09-17 Merge branch 'fc/fast-export'
2013-09-17 Merge branch 'ab/gitweb-author-initials'
2013-09-17 Merge branch 'jk/has-sha1-file-retry-packed'
2013-09-17 Merge branch 'jk/write-broken-index-with-nul-sha1'
2013-09-17 Merge branch 'jx/clean-interactive'
2013-09-17 Merge branch 'tb/precompose-autodetect-fix'
2013-09-17 Merge branch 'kk/tests-with-no-perl'
2013-09-17 Merge branch 'ap/commit-author-mailmap'
2013-09-17 Merge branch 'jk/free-tree-buffer'
2013-09-17 Merge branch 'maint'
2013-09-12 Sync with maint for l10n updates
2013-09-12 Merge branch 'jc/pager-configuration-doc'
2013-09-12 Merge branch 'mm/remote-helpers-doc'
2013-09-12 Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'
2013-09-12 Merge branch 'mm/fast-import-feature-doc'
2013-09-12 Merge branch 'mm/mediawiki-dumb-push-fix'
2013-09-12 Merge branch 'jc/commit-is-spelled-with-two-ems'
2013-09-12 Merge branch 'jk/config-int-range-check'
2013-09-11 Merge branch 'jc/ls-files-killed-optim'
2013-09-11 Merge branch 'es/rebase-i-no-abbrev'
2013-09-11 Merge branch 'rt/rebase-p-no-merge-summary'
2013-09-11 Merge branch 'tf/gitweb-ss-tweak'
2013-09-11 Merge branch 'sb/mailmap-freeing-NULL-is-ok'
2013-09-11 Merge branch 'js/xread-in-full'
2013-09-11 Merge branch 'es/rebase-i-respect-core-commentchar'
2013-09-11 Merge branch 'jn/post-receive-utf8'
2013-09-11 Merge branch 'sh/pull-rebase-preserve'
2013-09-11 Merge branch 'nd/push-no-thin'
2013-09-09 Merge branch 'nd/magic-pathspec'
2013-09-09 Merge branch 'jk/mailmap-incomplete-line'
2013-09-09 Merge branch 'sp/clip-read-write-to-8mb'
2013-09-09 Merge branch 'tg/index-struct-sizes'
2013-09-09 Merge branch 'jc/transport-do-not-use-connect-twice...
2013-09-09 Merge branch 'es/contacts-blame-L-multi'
2013-09-09 Merge branch 'jc/url-match'
2013-09-09 Merge branch 'jl/submodule-mv'
2013-09-09 Merge branch 'jk/cat-file-batch-optim'
2013-09-09 Merge branch 'jc/push-cas'
2013-09-09 Merge branch 'nd/clone-connectivity-shortcut'
2013-09-09 Merge branch 'jc/diff-filter-negation'
2013-09-09 Merge branch 'ms/fetch-prune-configuration'
2013-09-05 Merge branch 'nd/fetch-pack-shallow-fix' into maint
2013-09-05 Merge branch 'hv/config-from-blob' into maint
2013-09-05 Merge branch 'maint-1.8.3' into maint
2013-09-04 Merge branch 'jl/some-submodule-config-are-not-boolean'
2013-09-04 Merge branch 'sb/diff-delta-remove-needless-comparison'
2013-09-04 Merge branch 'nd/gc-lock-against-each-other'
2013-09-04 Merge branch 'tr/fd-gotcha-fixes'
2013-09-04 Merge branch 'bc/unuse-packfile'
2013-09-04 Merge branch 'da/darwin'
2013-09-04 Merge branch 'rr/feed-real-path-to-editor'
2013-09-04 Merge branch 'jk/fast-import-empty-ls'
2013-09-04 Merge branch 'km/svn-1.8-serf-only'
2013-09-04 Merge branch 'jc/check-x-z'
2013-09-03 Merge branch 'maint-1.8.3' into maint
2013-08-30 Merge branch 'rt/doc-merge-file-diff3'
2013-08-30 Merge branch 'rj/doc-rev-parse'
2013-08-30 Merge branch 'hv/config-from-blob'
2013-08-30 Merge branch 'nd/fetch-pack-shallow-fix'
2013-08-13 Merge branch 'sb/mailmap-updates'
2013-08-09 Merge branch 'maint'
2013-08-09 Merge branch 'jk/submodule-subdirectory-ok'
2013-08-09 Merge branch 'sb/mailmap-updates'
2013-08-05 Sync with maint to grab trivial doc fixes
2013-08-05 Merge branch 'es/blame-L-breakage'
2013-08-05 Merge branch 'sb/mailmap-updates'
2013-08-05 Merge branch 'dn/test-reject-utf-16'
2013-08-05 Merge branch 'bc/commit-invalid-utf8'
2013-08-02 Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat'
2013-08-02 Merge branch 'jk/cat-file-batch-optim'
2013-08-01 Merge branch 'jc/rm-submodule-error-message'
2013-08-01 Merge branch 'lf/echo-n-is-not-portable'
2013-08-01 Merge branch 'ma/hg-to-git'
2013-08-01 Merge branch 'jx/clean-interactive'
2013-07-31 Merge branch 'rr/rebase-autostash'
2013-07-31 Merge branch 'rj/commit-slab-fix'
2013-07-31 Merge branch 'jk/commit-how-to-abort-cherry-pick'
2013-07-31 Merge branch 'ds/doc-two-kinds-of-tags'
2013-07-31 Merge branch 'rr/maint-tilde-markup-in-doc'
2013-07-31 Merge branch 'mh/packed-refs-do-one-ref-recursion'
2013-07-30 Merge branch 'jk/capabilities-doc'
2013-07-30 Merge branch 'sb/mailmap-updates'
2013-07-30 Merge branch 'bc/completion-for-bash-3.0'
2013-07-25 Merge branch 'mh/multimail'
2013-07-25 Merge branch 'es/contacts'
2013-07-25 Merge branch 'ml/cygwin-updates'
2013-07-25 Merge branch 'rj/sparse'
2013-07-25 Merge branch 'sb/traverse-trees-bitmask-variable-name'
next