checkout --conflict=diff3: add a label for ancestor
[gitweb.git] / t / test-lib.sh
2010-03-20 Merge branch 'jk/maint-add-ignored-dir'
2010-03-20 Merge branch 'ml/color-grep'
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-20 Merge branch 'cc/reset-keep'
2010-03-20 Merge branch 'fl/askpass'
2010-03-20 Merge branch 'bg/apply-fix-blank-at-eof'
2010-03-20 Merge branch 'bw/union-merge-refactor'
2010-03-15 Merge branch 'sd/format-patch-to'
2010-03-15 Merge branch 'tc/http-cleanup'
2010-03-15 Merge branch 'tc/transport-verbosity'
2010-03-15 Merge branch 'ld/push-porcelain'
2010-03-15 Merge branch 'jh/notes'
2010-03-10 Merge branch 'sd/init-template'
2010-03-10 Merge branch 'sh/am-keep-cr'
2010-03-10 Merge branch 'cp/add-u-pathspec'
2010-03-10 Merge branch 'lt/deepen-builtin-source'
2010-03-08 Merge branch 'mw/maint-gcc-warns-unused-write' into...
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'gb/maint-submodule-env' into maint
2010-03-08 Merge branch 'as/maint-expire' into maint
2010-03-08 Merge branch 'ml/maint-grep-doc' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-08 Merge branch 'jc/fetch-param' into maint
2010-03-08 Merge branch 'ne/pack-local-doc' into maint
2010-03-08 Merge branch 'jk/maint-add--interactive-delete' into...
2010-03-08 Merge branch 'mm/mkstemps-mode-for-packfiles' into...
2010-03-08 Merge branch 'jc/maint-fix-mailinfo-strip' into maint
2010-03-08 Merge branch 'jc/grep-author-all-match-implicit' into...
2010-03-08 Merge branch 'jc/checkout-detached' into maint
2010-03-08 Merge branch 'maint-1.6.6' into maint
2010-03-07 Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
2010-03-07 Merge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07 Merge branch 'cc/maint-bisect-paths' into maint-1.6.6
2010-03-07 Merge branch 'mw/maint-gcc-warns-unused-write'
2010-03-07 Merge branch 'as/maint-expire'
2010-03-07 Merge branch 'ml/maint-grep-doc'
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'gb/maint-submodule-env'
2010-03-07 Merge branch 'ne/pack-local-doc'
2010-03-07 Merge branch 'mb/shortlog-nongit-stdin'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-07 Merge branch 'jc/fetch-param'
2010-03-07 Merge branch 'il/loosen-remote-helper-names'
2010-03-07 Merge branch 'nd/root-git'
2010-03-07 Merge branch 'js/runtime-prefix-trace-not-warn'
2010-03-07 Merge branch 'mm/mkstemps-mode-for-packfiles'
2010-03-07 Merge branch 'jk/maint-add--interactive-delete'
2010-03-07 Merge branch 'jc/maint-fix-mailinfo-strip'
2010-03-07 Sync with 1.7.0.2
2010-03-07 unset GREP_OPTIONS in test-lib.sh
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'rs/optim-text-wrap' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-05 Merge branch 'cc/maint-bisect-paths' into maint
2010-03-05 Merge branch 'maint-1.6.6' into maint
2010-03-05 Merge branch 'maint-1.6.5' into maint-1.6.6
2010-03-03 Merge branch 'hm/maint-imap-send-crlf' into maint
2010-03-03 Merge branch 'sp/maint-push-sideband' into maint
2010-03-03 Merge branch 'jc/maint-fix-test-perm' into maint
2010-03-02 Merge branch 'tr/maint-cherry-pick-list'
2010-03-02 Merge branch 'rs/optim-text-wrap'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-03-02 Merge branch 'jc/grep-author-all-match-implicit'
2010-03-01 Merge branch 'cc/maint-bisect-paths'
2010-02-26 Merge branch 'maint-1.6.6' into maint
2010-02-24 Merge branch 'ml/maint-grep-doc' into maint
2010-02-21 Merge branch 'ml/maint-grep-doc'
2010-02-21 Merge branch 'hm/maint-imap-send-crlf'
2010-02-21 Merge branch 'jc/checkout-detached'
2010-02-21 Merge branch 'jc/maint-fix-test-perm'
2010-02-21 Merge branch 'mv/request-pull-modernize'
2010-02-19 Merge branch 'jk/maint-rmdir-fix' into maint
2010-02-16 Merge branch 'maint-1.6.6' into maint
2010-02-16 Merge branch 'maint-1.6.5' into maint-1.6.6
2010-02-15 Merge branch 'maint-1.6.6' into maint
2010-02-12 Merge branch 'maint'
2010-02-12 Merge branch 'maint'
2010-02-10 Sync with 1.6.6.2
2010-02-10 Merge branch 'maint-1.6.5' into maint
2010-02-10 Merge branch 'gp/maint-cvsserver' into maint
2010-02-10 Merge branch 'jc/maint-reflog-bad-timestamp' into maint
2010-02-10 Merge branch 'il/maint-xmallocz' into maint
2010-02-10 Merge branch 'jh/maint-config-file-prefix' into maint
2010-02-10 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-10 Merge branch 'sp/maint-push-sideband' into sp/push...
2010-02-09 Merge branch 'maint'
2010-02-09 Merge branch 'maint-1.6.5' into maint
2010-02-09 Merge branch 'jc/maint-push-doc-status' into maint
2010-02-08 Merge branch 'jc/maint-imap-config-parse' into maint
2010-02-08 Merge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-07 Merge branch 'maint'
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-02-06 Merge branch 'sp/maint-push-sideband' into sp/push...
2010-02-06 Merge branch 'maint'
2010-02-03 Merge branch 'ms/filter-branch-submodule'
2010-02-03 Merge branch 'sp/fast-import-large-blob'
2010-02-01 Merge branch 'sp/maint-fast-import-large-blob' into...
next