Merge branch 'jc/same-encoding'
[gitweb.git] / Documentation / merge-config.txt
2011-07-13 Merge branch 'jc/legacy-loose-object'
2011-07-13 Merge branch 'an/shallow-doc'
2011-07-06 Merge commit 'v1.7.6' into jc/checkout-reflog-fix
2011-07-06 Merge commit 'v1.7.0' into jc/checkout-reflog-fix
2011-07-06 Merge commit 'v1.6.0' into jc/checkout-reflog-fix
2011-06-30 Merge branch 'jc/streaming-filter' into next
2011-06-30 Merge branch 'jn/gitweb-js-blame' into next
2011-06-30 Merge branch 'da/git-prefix-everywhere' into next
2011-06-30 Merge branch 'jc/streaming' into next
2011-06-30 Merge branch 'ab/i18n-scripts' into next
2011-06-30 Merge branch 'ef/maint-win-verify-path'
2011-06-30 Merge branch 'js/i18n-windows'
2011-06-30 Merge branch 'jc/maint-1.7.3-checkout-describe'
2011-06-30 Merge branch 'jk/maint-1.7.2-status-ignored'
2011-06-30 Merge branch 'jc/diff-index-quick-exit-early'
2011-06-30 Merge branch 'mg/diff-stat-count'
2011-06-30 Merge branch 'jc/advice-about-to-lose-commit'
2011-06-29 Merge branch 'maint-1.7.5' into maint
2011-06-29 Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
2011-06-26 Merge branch 'maint'
2011-06-24 Merge branch 'maint-1.7.4' into maint
2011-06-22 Merge branch 'maint'
2011-06-21 Merge branch 'maint'
2011-06-20 Merge branch 'mk/grep-pcre'
2011-06-19 Merge branch 'maint'
2011-06-17 Merge branch 'ab/i18n-scripts-basic'
2011-06-15 Merge branch 'db/delta-applier' into db/text-delta
2011-06-15 Merge branch 'db/delta-applier' into svn-fe
2011-06-09 Merge branch 'maint'
2011-06-07 Merge branch 'jc/magic-pathspec'
2011-06-06 Merge branch 'jn/mime-type-with-params'
2011-06-06 Merge branch 'jk/diff-not-so-quick'
2011-06-06 Merge branch 'bc/maint-status-z-to-use-porcelain'
2011-06-01 Sync with 1.7.5.4 v1.7.6-rc0
2011-06-01 Merge branch 'jk/maint-config-alias-fix' into maint
2011-06-01 Merge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-31 Merge branch 'jk/format-patch-am'
2011-05-31 Merge branch 'jn/doc-remote-helpers'
2011-05-31 Merge branch 'jc/log-quiet-fix'
2011-05-31 Merge branch 'kk/maint-prefix-in-config-mak'
2011-05-31 Merge branch 'jk/maint-docs'
2011-05-31 Merge branch 'jk/read-in-full-stops-on-error'
2011-05-31 Merge branch 'jk/maint-remote-mirror-safer'
2011-05-31 Sync with maint
2011-05-31 Merge branch 'jc/rename-degrade-cc-to-c' into maint
2011-05-31 Merge branch 'rr/doc-content-type' into maint
2011-05-31 Merge remote-tracking branch 'ko/maint' into jc/diff...
2011-05-31 Merge branch 'jc/fmt-req-fix'
2011-05-31 Merge branch 'jk/maint-config-alias-fix'
2011-05-30 Merge branch 'maint'
2011-05-30 Merge branch 'jm/maint-misc-fix' into maint
2011-05-30 Merge branch 'mk/grep-pcre'
2011-05-30 Merge branch 'jk/haves-from-alternate-odb'
2011-05-26 Merge branch 'jn/userdiff-perl-updates'
2011-05-26 Merge branch 'rg/no-gecos-in-pwent'
2011-05-26 Merge branch 'jk/fetch-mark-complete-optimization'
2011-05-26 Merge branch 'jn/gitweb-js'
2011-05-26 Merge branch 'jn/ctags-more'
2011-05-26 Merge branch 'jc/require-work-tree-exists'
2011-05-26 Sync with 1.7.5.3
2011-05-26 Merge branch 'maint-1.7.4' into maint
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26 Merge branch 'jm/maint-diff-words-with-sbe' into maint
2011-05-26 Merge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-26 Merge branch 'ss/doc-svn' into maint
2011-05-26 Merge branch 'rg/copy-gecos-username' into maint
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26 Merge branch 'svn-fe-maint' of git://repo.or.cz/git...
2011-05-26 Merge branch 'db/delta-applier' into db/text-delta
2011-05-26 Merge branch 'db/svn-fe-code-purge' into svn-fe
2011-05-26 Merge branch 'db/vcs-svn-incremental' into svn-fe
2011-05-25 Merge branch 'jc/bigfile'
2011-05-25 Merge branch 'maint'
2011-05-23 Merge branch 'tr/add-i-no-escape'
2011-05-23 Merge branch 'jm/maint-diff-words-with-sbe'
2011-05-23 Merge branch 'js/mingw-shutdown'
2011-05-23 Merge branch 'ab/i18n-scripts-basic'
2011-05-23 Merge branch 'jc/magic-pathspec'
2011-05-23 Merge branch 'jk/blame-line-porcelain'
2011-05-21 Merge branch 'maint'
2011-05-20 Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-20 Merge branch 'rg/copy-gecos-username'
2011-05-20 Merge branch 'jl/submodule-conflicted-gitmodules'
2011-05-20 Merge branch 'jc/replacing'
2011-05-20 Merge branch 'nd/sparse-co-fix'
2011-05-20 Merge branch 'ld/p4-preserve-user-names'
2011-05-20 Merge branch 'ms/tagname-does-not-begin-with-dash'
2011-05-20 Merge branch 'jk/git-connection-deadlock-fix'
2011-05-20 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-20 Merge branch 'jk/cherry-pick-root-with-resolve'
2011-05-20 Merge branch 'jc/maint-pathspec-stdin-and-cmdline'
2011-05-20 Merge 1.7.5.2 in
2011-05-16 Merge branch 'jc/convert'
2011-05-16 Merge branch 'ci/commit--interactive-atomic'
2011-05-16 Merge branch 'sg/completion-updates'
2011-05-16 Merge branch 'kk/maint-prefix-in-config-mak'
2011-05-16 Merge branch 'mg/merge-ff-config'
2011-05-16 Merge branch 'jn/maint-format-patch-doc' into maint
next