Merge pull request from jiangxin/master
[git] / combine-diff.c
2012-02-27  Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-27  Junio C HamanoMerge branch 'jn/ancient-meld-support' into maint
2012-02-27  Junio C HamanoMerge branch 'tr/maint-bundle-long-subject'
2012-02-27  Junio C HamanoMerge branch 'sp/smart-http-failure-to-push'
2012-02-27  Junio C HamanoMerge branch 'jc/doc-merge-options'
2012-02-27  Junio C HamanoMerge branch 'jk/maint-avoid-streaming-filtered-contents'
2012-02-27  Junio C HamanoMerge branch 'jb/filter-ignore-sigpipe'
2012-02-27  Junio C HamanoSync with 1.7.8.5
2012-02-23  Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix'
2012-02-21  Junio C HamanoMerge branch 'cb/receive-pack-keep-errors' into maint
2012-02-21  Junio C HamanoMerge branch 'jk/git-dir-lookup' into maint
2012-02-21  Junio C HamanoMerge branch 'jc/diff-stat-scaler' into maint
2012-02-21  Junio C HamanoMerge branch 'zj/term-columns' into maint
2012-02-21  Junio C HamanoMerge branch 'cb/maint-rev-list-verify-object' into...
2012-02-21  Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable...
2012-02-20  Junio C HamanoMerge branch 'jc/diff-stat-scaler'
2012-02-20  Junio C HamanoMerge branch 'zj/term-columns'
2012-02-20  Junio C HamanoMerge branch 'cb/receive-pack-keep-errors'
2012-02-20  Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable'
2012-02-20  Junio C HamanoMerge branch 'cb/maint-rev-list-verify-object'
2012-02-16  Junio C HamanoMerge branch 'jc/checkout-out-of-unborn' into maint
2012-02-16  Junio C HamanoMerge branch 'jc/maint-mailmap-output' into maint
2012-02-16  Junio C HamanoMerge branch 'jc/maint-commit-ignore-i-t-a' into maint
2012-02-16  Junio C HamanoMerge branch 'mm/empty-loose-error-message' into maint
2012-02-14  Junio C HamanoMerge branch 'jk/git-dir-lookup'
2012-02-14  Junio C HamanoMerge branch 'jn/ancient-meld-support'
2012-02-14  Junio C HamanoMerge branch 'jk/maint-tag-show-fixes' into maint
2012-02-14  Junio C HamanoMerge branch 'bw/inet-pton-ntop-compat' into maint
2012-02-14  Junio C HamanoMerge branch 'mp/make-cleanse-x-for-exe' into maint
2012-02-13  Junio C HamanoMerge branch 'js/add-e-submodule-fix' into maint
2012-02-13  Junio C HamanoMerge branch 'jc/parse-date-raw' into maint
2012-02-13  Junio C HamanoMerge branch 'jc/checkout-out-of-unborn'
2012-02-13  Junio C HamanoMerge branch 'jc/maint-mailmap-output'
2012-02-13  Junio C HamanoMerge branch 'mp/make-cleanse-x-for-exe'
2012-02-13  Junio C HamanoMerge branch 'bw/inet-pton-ntop-compat'
2012-02-13  Junio C HamanoMerge branch 'jc/maint-commit-ignore-i-t-a'
2012-02-13  Junio C HamanoMerge branch 'jk/maint-tag-show-fixes'
2012-02-13  Junio C HamanoMerge branch 'mm/empty-loose-error-message'
2012-02-10  Junio C HamanoMerge branch 'js/add-e-submodule-fix'
2012-02-10  Junio C HamanoMerge branch 'jc/parse-date-raw'
2012-02-10  Junio C HamanoMerge branch 'tr/grep-l-with-decoration' into maint
2012-02-10  Junio C HamanoMerge branch 'jl/submodule-re-add' into maint
2012-02-10  Junio C HamanoMerge branch 'da/maint-mergetool-twoway' into maint
2012-02-06  Junio C HamanoMerge branch 'sp/smart-http-failure-to-push' into maint
2012-02-06  Junio C HamanoMerge branch 'jc/maint-log-first-parent-pathspec' into...
2012-02-06  Junio C HamanoSync with 1.7.6.6
2012-02-06  Junio C HamanoSync with 1.7.6.6
2012-02-01  Junio C HamanoMerge branch 'jc/pull-signed-tag'
2012-02-01  Junio C HamanoMerge branch 'ar/i18n-no-gettext'
2012-02-01  Junio C HamanoMerge branch 'da/maint-mergetool-twoway'
2012-02-01  Junio C HamanoMerge branch 'jl/submodule-re-add'
2012-02-01  Junio C HamanoMerge branch 'tr/grep-l-with-decoration'
2012-02-01  Junio C HamanoMerge branch 'ks/sort-wildcard-in-makefile'
2012-02-01  Junio C HamanoMerge branch 'jc/advise-i18n'
2012-01-29  Junio C HamanoMerge branch 'rs/diff-postimage-in-context'
2012-01-29  Junio C HamanoMerge branch 'sp/smart-http-failure-to-push'
2012-01-29  Junio C HamanoMerge branch 'jc/maint-log-first-parent-pathspec'
2012-01-29  Junio C HamanoMerge branch 'jl/test-pause'
2012-01-29  Junio C HamanoMerge branch 'tr/maint-mailinfo'
2012-01-29  Junio C HamanoMerge branch 'nd/maint-refname-in-hierarchy-check'
2012-01-29  Junio C HamanoMerge branch 'jn/gitweb-unspecified-action'
2012-01-27  Junio C HamanoMerge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
2012-01-18  Junio C HamanoMerge branch 'maint'
2012-01-18  Junio C HamanoMerge branch 'jk/credentials'
2012-01-18  Junio C HamanoMerge branch 'mh/maint-show-ref-doc'
2012-01-18  Junio C HamanoMerge branch 'tr/maint-word-diff-incomplete-line'
2012-01-17  Junio C HamanoMerge branch 'jn/maint-gitweb-grep-fix'
2012-01-13  Junio C HamanoMerge branch 'jc/request-pull-show-head-4'
2012-01-13  Junio C HamanoMerge branch 'tr/maint-mailinfo'
2012-01-13  Junio C HamanoMerge branch 'ss/maint-msys-cvsexportcommit'
2012-01-13  Junio C HamanoMerge branch 'jk/maint-upload-archive'
2012-01-13  Junio C HamanoMerge branch 'maint'
2012-01-13  Junio C HamanoMerge branch 'maint-1.7.6' into maint-1.7.7
2012-01-12  Junio C HamanoMerge branch 'maint'
2012-01-12  Junio C HamanoMerge branch 'maint-1.7.6' into maint-1.7.7
2012-01-10  Junio C HamanoMerge branch 'bw/maint-t8006-sed-incomplete-line'
2012-01-10  Junio C HamanoSync with maint
2012-01-10  Junio C HamanoMerge the attributes fix in from maint-1.6.6 branch
2012-01-09  Junio C HamanoMerge branch 'jk/credentials'
2012-01-09  Junio C HamanoMerge branch 'mh/ref-api-less-extra-refs'
2012-01-09  Junio C HamanoMerge branch 'mm/maint-gitweb-project-maxdepth'
2012-01-09  Junio C HamanoMerge branch 'maint'
2012-01-06  Junio C HamanoMerge branch 'jc/show-sig'
2012-01-06  Junio C HamanoSync with 1.7.8.3
2012-01-06  Junio C HamanoMerge branch 'maint-1.7.6' into maint-1.7.7
2012-01-04  Junio C HamanoMerge branch 'maint'
2012-01-04  Junio C HamanoMerge branch 'nd/maint-parse-depth' into maint
2012-01-03  Junio C HamanoMerge branch 'pw/p4-docs-and-tests'
2012-01-03  Junio C HamanoMerge branch 'maint'
2012-01-03  Junio C HamanoMerge branch 'maint-1.7.6' into maint-1.7.7
2011-12-28  Junio C HamanoSync with 1.7.8.2
2011-12-28  Junio C HamanoMerge branch 'jv/maint-config-set' into maint
2011-12-28  Junio C HamanoMerge branch 'jc/checkout-m-twoway' into maint
2011-12-28  Junio C HamanoMerge branch 'tr/doc-sh-setup' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-push-v-is-verbose' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-snprintf-va-copy' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-mv' into maint
2011-12-28  Junio C HamanoMerge branch 'ew/keepalive' into maint
2011-12-28  Junio C HamanoMerge branch 'na/strtoimax' into maint
next