submodule: Demonstrate known breakage during recursive merge
[git] / userdiff.h
2011-08-16  Junio C HamanoMerge branch 'bw/log-all-ref-updates-doc' into maint
2011-08-16  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16  Junio C HamanoMerge branch 'ms/help-unknown' into maint
2011-08-16  Junio C HamanoMerge branch 'mz/doc-synopsis-verse' into maint
2011-08-16  Junio C HamanoMerge branch 'jn/mime-type-with-params' into maint
2011-08-16  Junio C HamanoMerge branch 'jc/submodule-sync-no-auto-vivify' into...
2011-08-16  Junio C HamanoMerge branch 'jc/zlib-wrap' into maint
2011-08-16  Junio C HamanoMerge branch 'fk/relink-upon-ldflags-update' into maint
2011-08-16  Junio C HamanoMerge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
2011-08-16  Junio C HamanoMerge branch 'aw/rebase-i-p' into maint
2011-08-16  Junio C HamanoMerge branch 'jc/diff-index-quick-exit-early' into...
2011-08-16  Junio C HamanoMerge branch 'jk/combine-diff-binary-etc' into maint
2011-08-11  Junio C HamanoMerge branch 'cb/partial-commit-relative-pathspec'
2011-08-11  Junio C HamanoMerge branch 'jk/fast-export-quote-path'
2011-08-11  Junio C HamanoMerge branch 'rc/maint-http-wrong-free'
2011-08-08  Junio C HamanoMerge branch 'oa/pull-reflog'
2011-08-08  Junio C HamanoMerge branch 'ms/reflog-show-is-default'
2011-08-08  Junio C HamanoMerge branch 'jl/submodule-status-summary-doc'
2011-08-08  Junio C HamanoMerge branch 'jn/gitweb-config-list-case'
2011-08-08  Junio C HamanoMerge branch 'jl/submodule-update-quiet'
2011-08-08  Junio C HamanoMerge branch 'js/ls-tree-error'
2011-08-08  Junio C HamanoMerge branch 'jn/gitweb-system-config'
2011-08-08  Junio C HamanoMerge branch 'jk/reset-reflog-message-fix'
2011-08-08  Junio C HamanoMerge branch 'jc/diff-index-refactor'
2011-08-08  Junio C HamanoMerge branch 'maint'
2011-08-03  Junio C HamanoMerge branch 'maint'
2011-08-01  Junio C HamanoMerge branch 'vi/make-test-vector-less-specific'
2011-08-01  Junio C HamanoMerge branch 'jk/clone-detached'
2011-08-01  Junio C HamanoMerge branch 'jc/streaming-filter'
2011-08-01  Junio C HamanoMerge branch 'sr/transport-helper-fix'
2011-08-01  Junio C HamanoMerge branch 'jc/maint-reset-unmerged-path'
2011-08-01  Junio C HamanoMerge branch 'maint'
2011-08-01  Junio C HamanoMerge branch 'maint' into ef/ipv4-connect-error-report
2011-08-01  Junio C HamanoMerge branch 'maint'
2011-07-24  Junio C HamanoMerge branch 'maint'
2011-07-22  Junio C HamanoMerge branch 'dc/stash-con-untracked'
2011-07-22  Junio C HamanoMerge branch 'jk/tag-contains-ab'
2011-07-22  Junio C HamanoMerge branch 'dz/connect-error-report'
2011-07-22  Junio C HamanoMerge branch 'mz/doc-rebase-abort'
2011-07-22  Junio C HamanoMerge branch 'bw/log-all-ref-updates-doc'
2011-07-22  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd'
2011-07-22  Junio C HamanoMerge branch 'ms/help-unknown'
2011-07-22  Junio C HamanoMerge branch 'mz/doc-synopsis-verse'
2011-07-22  Junio C HamanoMerge branch 'jc/checkout-reflog-fix'
2011-07-22  Junio C HamanoMerge branch 'jc/maint-mergetool-read-fix'
2011-07-22  Junio C HamanoMerge branch 'jn/gitweb-search'
2011-07-22  Junio C HamanoMerge branch 'jl/submodule-add-relurl-wo-upstream'
2011-07-22  Junio C HamanoMerge branch 'maint'
2011-07-19  Junio C HamanoMerge branch 'jc/index-pack'
2011-07-19  Junio C HamanoMerge branch 'jn/mime-type-with-params'
2011-07-19  Junio C HamanoMerge branch 'jc/submodule-sync-no-auto-vivify'
2011-07-19  Junio C HamanoMerge branch 'jk/archive-tar-filter'
2011-07-19  Junio C HamanoMerge branch 'jn/gitweb-split-header-html'
2011-07-19  Junio C HamanoMerge branch 'jk/clone-cmdline-config'
2011-07-19  Junio C HamanoMerge branch 'jk/maint-config-param'
2011-07-19  Junio C HamanoMerge branch 'jk/tag-list-multiple-patterns'
2011-07-19  Junio C HamanoMerge branch 'jc/zlib-wrap'
2011-07-19  Junio C HamanoMerge branch 'ak/gcc46-profile-feedback'
2011-07-13  Junio C HamanoMerge branch 'js/rebase-typo-branch-squelch-usage'
2011-07-13  Junio C HamanoMerge branch 'jn/doc-dashdash'
2011-07-13  Junio C HamanoMerge branch 'bc/submodule-foreach-stdin-fix-1.7.4'
2011-07-13  Junio C HamanoMerge branch 'nk/ref-doc'
2011-07-13  Junio C HamanoMerge branch 'fk/relink-upon-ldflags-update'
2011-07-13  Junio C HamanoMerge branch 'jl/maint-fetch-recursive-fix'
2011-07-13  Junio C HamanoMerge branch 'jc/maint-cygwin-trust-executable-bit...
2011-07-13  Junio C HamanoMerge branch 'aw/rebase-i-p'
2011-07-13  Junio C HamanoMerge branch 'rj/config-cygwin'
2011-07-13  Junio C HamanoMerge branch 'md/interix-update'
2011-07-13  Junio C HamanoMerge branch 'ln/gitweb-mime-types-split-at-blank'
2011-07-13  Junio C HamanoMerge branch 'jc/no-gitweb-test-without-cgi-etc'
2011-07-13  Junio C HamanoMerge branch 'fg/submodule-keep-updating'
2011-07-13  Junio C HamanoMerge branch 'jc/legacy-loose-object'
2011-07-13  Junio C HamanoMerge branch 'an/shallow-doc'
2011-07-06  Junio C HamanoMerge branch 'maint'
2011-07-06  Junio C HamanoMerge commit 'v1.7.6' into jc/checkout-reflog-fix
2011-07-06  Junio C HamanoMerge commit 'v1.7.0' into jc/checkout-reflog-fix
2011-06-30  Junio C HamanoMerge branch 'jc/streaming-filter' into next
2011-06-30  Junio C HamanoMerge branch 'jn/gitweb-js-blame' into next
2011-06-30  Junio C HamanoMerge branch 'da/git-prefix-everywhere' into next
2011-06-30  Junio C HamanoMerge branch 'jc/streaming' into next
2011-06-30  Junio C HamanoMerge branch 'ab/i18n-scripts' into next
2011-06-30  Junio C HamanoMerge branch 'ef/maint-win-verify-path'
2011-06-30  Junio C HamanoMerge branch 'js/i18n-windows'
2011-06-30  Junio C HamanoMerge branch 'rs/grep-color'
2011-06-30  Junio C HamanoMerge branch 'jc/maint-1.7.3-checkout-describe'
2011-06-30  Junio C HamanoMerge branch 'db/http-cookies'
2011-06-30  Junio C HamanoMerge branch 'jk/maint-1.7.2-status-ignored'
2011-06-30  Junio C HamanoMerge branch 'jc/diff-index-quick-exit-early'
2011-06-30  Junio C HamanoMerge branch 'mg/diff-stat-count'
2011-06-30  Junio C HamanoMerge branch 'jc/advice-about-to-lose-commit'
2011-06-30  Junio C HamanoMerge branch 'jk/combine-diff-binary-etc'
2011-06-06  Junio C HamanoMerge branch 'jn/mime-type-with-params'
2011-06-06  Junio C HamanoMerge branch 'jk/diff-not-so-quick'
2011-06-06  Junio C HamanoMerge branch 'bc/maint-status-z-to-use-porcelain'
2011-05-31  Junio C HamanoMerge remote-tracking branch 'ko/maint' into jc/diff...
2011-05-26  Junio C HamanoMerge branch 'rg/no-gecos-in-pwent'
2011-05-26  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26  Junio C HamanoMerge branch 'rg/copy-gecos-username' into maint
2011-05-26  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into...
next