Merge branch 'da/mergetools-p4'
[gitweb.git] / t / t7600-merge.sh
2012-02-20 Merge branch 'cb/maint-t5541-make-server-port-portable'
2012-02-20 Merge branch 'cb/maint-rev-list-verify-object'
2012-02-16 Merge branch 'jc/checkout-out-of-unborn' into maint
2012-02-16 Merge branch 'jc/maint-mailmap-output' into maint
2012-02-16 Merge branch 'jk/prompt-fallback-to-tty' into maint
2012-02-16 Merge branch 'jn/gitweb-search-utf-8' into maint
2012-02-16 Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
2012-02-16 Merge branch 'mm/empty-loose-error-message' into maint
2012-02-16 Merge branch 'nk/ctype-for-perf' into maint
2012-02-16 Merge branch 'jx/i18n-more-marking' into maint
2012-02-16 Merge branch 'rt/completion-branch-edit-desc' into...
2012-02-14 Merge branch 'jk/git-dir-lookup'
2012-02-14 Merge branch 'jk/grep-binary-attribute'
2012-02-14 Merge branch 'nd/pack-objects-parseopt'
2012-02-14 Merge branch 'dp/i18n-libcharset'
2012-02-14 Merge branch 'mh/war-on-extra-refs'
2012-02-14 Merge branch 'lt/pull-no-edit'
2012-02-14 Merge branch 'bl/gitweb-project-filter'
2012-02-14 Merge branch 'jn/ancient-meld-support'
2012-02-14 Merge branch 'jk/userdiff-config-simplify'
2012-02-14 Merge branch 'jk/maint-tag-show-fixes' into maint
2012-02-14 Merge branch 'bw/inet-pton-ntop-compat' into maint
2012-02-14 Merge branch 'mp/make-cleanse-x-for-exe' into maint
2012-02-14 Merge branch 'jn/merge-no-edit-fix' into maint
2012-02-13 Sync with maint
2012-02-13 Merge branch 'js/add-e-submodule-fix' into maint
2012-02-13 Merge branch 'jc/parse-date-raw' into maint
2012-02-13 Merge branch 'jc/merge-ff-only-stronger-than-signed...
2012-02-13 Merge branch 'jc/checkout-out-of-unborn'
2012-02-13 Merge branch 'jc/maint-mailmap-output'
2012-02-13 Merge branch 'jk/prompt-fallback-to-tty'
2012-02-13 Merge branch 'jn/gitweb-search-utf-8'
2012-02-13 Merge branch 'nd/diffstat-gramnum'
2012-02-13 Merge branch 'nd/find-pack-entry-recent-cache-invalidation'
2012-02-13 Merge branch 'tt/profile-build-fix'
2012-02-13 Merge branch 'nd/cache-tree-api-refactor'
2012-02-13 Merge branch 'fc/zsh-completion'
2012-02-13 Merge branch 'mp/make-cleanse-x-for-exe'
2012-02-13 Merge branch 'bw/inet-pton-ntop-compat'
2012-02-13 Merge branch 'jc/maint-commit-ignore-i-t-a'
2012-02-13 Merge branch 'jk/maint-tag-show-fixes'
2012-02-13 Merge branch 'mm/empty-loose-error-message'
2012-02-13 Merge branch 'nk/ctype-for-perf'
2012-02-13 Merge branch 'jn/merge-no-edit-fix'
2012-02-10 Merge branch 'js/add-e-submodule-fix'
2012-02-10 Merge branch 'jc/parse-date-raw'
2012-02-10 Merge branch 'jc/merge-ff-only-stronger-than-signed...
2012-02-10 Merge branch 'jl/submodule-re-add' into maint
2012-02-10 Merge branch 'da/maint-mergetool-twoway' into maint
2012-02-09 merge: do not launch an editor on "--no-edit $tag"
2012-02-06 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-02-06 Merge branch 'jc/maint-log-first-parent-pathspec' into...
2012-02-06 Sync with 1.7.6.6
2012-02-06 Sync with 1.7.6.6
2012-02-06 merge: do not create a signed tag merge under --ff...
2012-02-01 Merge branch 'da/maint-mergetool-twoway'
2012-02-01 Merge branch 'jl/submodule-re-add'
2012-02-01 Merge branch 'ks/sort-wildcard-in-makefile'
2012-02-01 Merge branch 'jc/advise-i18n'
2012-01-29 Merge branch 'rs/diff-postimage-in-context'
2012-01-29 Merge branch 'sp/smart-http-failure-to-push'
2012-01-29 Merge branch 'jc/maint-log-first-parent-pathspec'
2012-01-29 Merge branch 'tr/maint-mailinfo'
2012-01-29 Merge branch 'nd/maint-refname-in-hierarchy-check'
2012-01-29 Merge branch 'jn/gitweb-unspecified-action'
2012-01-27 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
2012-01-18 Merge branch 'maint'
2012-01-18 Merge branch 'maint-1.7.7' into maint
2012-01-18 Merge branch 'jk/credentials'
2012-01-18 Merge branch 'mh/maint-show-ref-doc'
2012-01-18 Merge branch 'tr/maint-word-diff-incomplete-line'
2012-01-17 Merge branch 'jn/maint-gitweb-grep-fix'
2012-01-13 Merge branch 'jc/request-pull-show-head-4'
2012-01-13 Merge branch 'tr/maint-mailinfo'
2012-01-13 Merge branch 'ss/maint-msys-cvsexportcommit'
2012-01-13 Merge branch 'jk/maint-upload-archive'
2012-01-13 Merge branch 'maint'
2012-01-13 Merge branch 'maint-1.7.7' into maint
2012-01-12 Merge branch 'maint'
2012-01-12 Merge branch 'maint-1.7.7' into maint
2012-01-10 Merge branch 'bw/maint-t8006-sed-incomplete-line'
2012-01-10 Sync with maint
2012-01-10 Merge the attributes fix in from maint-1.6.7 branch
2012-01-09 Merge branch 'jk/credentials'
2012-01-09 Merge branch 'mm/maint-gitweb-project-maxdepth'
2012-01-09 Merge branch 'maint'
2012-01-06 Sync with 1.7.8.3
2012-01-06 Merge branch 'maint-1.7.7' into maint
2012-01-04 Merge branch 'maint'
2012-01-04 Merge branch 'nd/maint-parse-depth' into maint
2012-01-03 Merge branch 'maint'
2012-01-03 Merge branch 'maint-1.7.7' into maint
2011-12-28 Sync with 1.7.8.2
2011-12-28 Merge branch 'jv/maint-config-set' into maint
2011-12-28 Merge branch 'jc/checkout-m-twoway' into maint
2011-12-28 Merge branch 'tr/doc-sh-setup' into maint
2011-12-28 Merge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-28 Merge branch 'jk/maint-push-v-is-verbose' into maint
2011-12-28 Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
2011-12-28 Merge branch 'jk/maint-snprintf-va-copy' into maint
next