tests: document cherry-pick behavior in face of conflicts
[gitweb.git] / t / t5303-pack-corruption-resilience.sh
2009-11-21 Merge branch 'tr/filter-branch'
2009-11-21 Merge branch 'sc/protocol-doc'
2009-11-21 Merge branch 'jl/submodule-add-noname'
2009-11-21 Merge branch 'sb/ls-tree-parseopt'
2009-11-21 Merge branch 'rg/doc-workflow'
2009-11-21 Merge branch 'jp/fetch-cull-many-refs'
2009-11-18 Merge branch 'np/maint-sideband-favor-status'
2009-11-18 Merge branch 'ef/msys-imap'
2009-11-16 Merge branch 'bs/maint-pre-commit-hook-sample' into...
2009-11-16 Merge branch 'jk/maint-add-p-empty' into maint
2009-11-16 Merge branch 'js/maint-diff-color-words' into maint
2009-11-16 Merge branch 'tz/maint-rpm' into maint
2009-11-16 Merge branch 'jk/maint-format-patch-p-suppress-stat...
2009-11-16 Merge branch 'pb/maint-gitweb-blob-lineno' into maint
2009-11-16 Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
2009-11-16 Merge branch 'jk/maint-push-config' into maint
2009-11-16 Merge branch 'sr/blame-incomplete' into maint
2009-11-16 Merge branch 'jc/maint-blank-at-eof' into maint
2009-11-16 Merge branch 'bs/maint-pre-commit-hook-sample'
2009-11-16 Merge branch 'js/maint-diff-color-words'
2009-11-16 Merge branch 'fc/doc-fast-forward'
2009-11-16 Merge branch 'jk/maint-add-p-empty'
2009-11-16 Merge branch 'lt/revision-bisect'
2009-11-16 Merge branch 'jc/maint-1.6.3-graft-trailing-space'...
2009-11-16 Merge branch 'tr/maint-roff-quote' into maint
2009-11-16 Merge branch 'ja/fetch-doc' into maint
2009-11-16 Merge branch 'cb/doc-fetch-pull-merge' into maint
2009-11-16 Merge branch 'jc/receive-pack-auto' into maint
2009-11-16 Merge branch 'gb/maint-gitweb-esc-param' into maint
2009-11-16 Merge branch 'jn/gitweb-patch' into maint
2009-11-10 Merge branch 'jk/maint-format-patch-p-suppress-stat'
2009-11-10 Merge branch 'pb/maint-gitweb-blob-lineno'
2009-11-10 Merge branch 'jk/maint-1.6.3-ls-files-i'
2009-11-10 Merge branch 'jk/maint-push-config'
2009-11-10 Merge branch 'jp/dirty-describe'
2009-11-10 Merge branch 'sr/blame-incomplete'
2009-11-02 Merge branch 'jn/show-normalized-refs'
2009-11-02 Merge branch 'bg/clone-doc' into maint
2009-10-31 fixup tr/stash-format merge
2009-10-31 Merge branch 'js/diff-verbose-submodule'
2009-10-31 Merge branch 'jn/show-normalized-refs'
2009-10-31 Merge branch 'jc/maint-1.6.3-graft-trailing-space'
2009-10-31 Merge branch 'ak/bisect-reset-to-switch'
2009-10-31 Merge branch 'tr/maint-roff-quote'
2009-10-31 Merge branch 'ja/fetch-doc'
2009-10-31 Merge branch 'cb/doc-fetch-pull-merge'
2009-10-28 Merge branch 'maint-1.6.4' into maint
2009-10-27 Merge git://repo.or.cz/git-gui
2009-10-26 Merge branch 'sb/gitweb-link-author'
2009-10-26 Merge branch 'iv/tar-lzma-xz'
2009-10-26 Merge branch 'bg/clone-doc'
2009-10-26 Merge branch 'jc/receive-pack-auto'
2009-10-25 Merge branch 'maint-1.6.4' into maint
2009-10-24 Merge branch 'jp/maint-send-email-fold' into maint
2009-10-24 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Merge branch 'pv/maint-add-p-no-exclude' into maint
2009-10-22 Merge branch 'gb/maint-gitweb-esc-param'
2009-10-19 Merge branch 'bg/rebase-reword'
2009-10-19 Merge branch 'jp/maint-send-email-fold'
2009-10-19 Merge branch 'cc/replace-no-replace'
2009-10-19 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'
2009-10-19 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
2009-10-19 Merge branch 'jn/gitweb-show-size'
2009-10-19 Merge branch 'jp/fetch-tag-match'
2009-10-19 Merge branch 'jn/gitweb-patch'
2009-10-19 Merge branch 'tf/doc-pt-br'
2009-10-19 Merge branch 'dk/blame-el'
2009-10-19 Merge branch 'mr/instaweb-cgid'
2009-10-17 Merge branch 'jc/maint-blank-at-eof'
2009-10-17 Merge branch 'maint-1.6.4' into maint
2009-10-14 Merge branch 'pv/maint-add-p-no-exclude'
2009-10-14 Merge branch 'maint'
2009-10-14 sha1_file: Fix infinite loop when pack is corrupted
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-16 Merge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-28 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-28 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-08-28 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-08-21 Merge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-11 Merge branch 'jc/maint-merge-recursive-fix'
2009-08-08 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-08 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-07-29 Merge branch 'hv/cvsps-tests'
2009-07-02 Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-06-22 Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-22 Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
2009-06-21 Merge branch 'maint-1.6.2' into maint
2009-06-21 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-06-21 Merge branch 'pb/maint-1.6.2-userdiff-fix'
2009-06-21 Merge branch 'sb/maint-1.6.0-add-config-fix'
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-14 Merge branch 'maint-1.6.2' into maint
next