Merge branch 'tr/cache-tree'
[git] / t / t7600-merge.sh
2011-12-20  Junio C HamanoMerge branch 'tr/cache-tree'
2011-12-20  Junio C HamanoMerge branch 'jk/credentials'
2011-12-17  Junio C HamanoMerge branch 'jc/commit-amend-no-edit'
2011-12-17  Junio C HamanoMerge branch 'jc/stream-to-pack'
2011-12-17  Junio C HamanoMerge branch 'aw/rebase-i-stop-on-failure-to-amend'
2011-12-17  Junio C HamanoMerge branch 'jh/fast-import-notes'
2011-12-17  Junio C HamanoMerge branch 'jk/upload-archive-use-start-command'
2011-12-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2011-12-14  Junio C HamanoMerge branch 'ks/tag-cleanup'
2011-12-14  Junio C HamanoMerge branch 'jl/submodule-status-failure-report'
2011-12-14  Junio C HamanoMerge branch 'tr/userdiff-c-returns-pointer'
2011-12-14  Junio C HamanoMerge branch 'bc/maint-apply-check-no-patch'
2011-12-14  Junio C HamanoMerge branch 'nd/ignore-might-be-precious'
2011-12-14  Junio C HamanoMerge branch 'jn/branch-move-to-self'
2011-12-14  Junio C HamanoMerge branch 'cn/maint-lf-to-crlf-filter'
2011-12-14  Junio C HamanoMerge branch 'tj/maint-imap-send-remove-unused'
2011-12-14  Junio C HamanoMerge branch 'jk/maint-upload-archive'
2011-12-14  Junio C HamanoMerge branch 'jn/gitweb-side-by-side-diff'
2011-12-14  Junio C HamanoMerge branch 'maint'
2011-12-14  Junio C HamanoMerge branch 'jc/maint-pack-object-cycle' into maint
2011-12-14  Junio C HamanoMerge branch 'jc/index-pack-reject-dups' into maint
2011-12-14  Junio C HamanoMerge branch 'mf/curl-select-fdset' into maint
2011-12-14  Junio C HamanoMerge branch 'maint-1.7.7' into maint
2011-12-14  Junio C HamanoMerge branch 'nd/maint-ignore-exclude' into maint-1.7.7
2011-12-14  Junio C HamanoMerge branch 'jk/maint-fetch-status-table' into maint...
2011-12-14  Junio C HamanoMerge branch 'jc/maint-name-rev-all' into maint-1.7.6
2011-12-14  Junio C HamanoMerge branch 'ml/mailmap' into maint-1.7.6
2011-12-14  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2011-12-09  Junio C HamanoMerge branch 'sg/complete-refs'
2011-12-09  Junio C HamanoMerge branch 'nd/resolve-ref'
2011-12-09  Junio C HamanoMerge branch 'jc/pull-signed-tag'
2011-12-09  Junio C HamanoMerge branch 'jc/request-pull-show-head-4'
2011-12-09  Junio C HamanoMerge branch 'ab/pull-rebase-config'
2011-12-09  Junio C HamanoMerge branch 'maint-1.7.7' into maint
2011-12-05  Junio C HamanoMerge branch 'nd/maint-ignore-exclude'
2011-12-05  Junio C HamanoMerge branch 'vr/git-merge-default-to-upstream'
2011-12-05  Junio C HamanoMerge branch 'jc/maint-pack-object-cycle'
2011-12-05  Junio C HamanoMerge branch 'jc/index-pack-reject-dups'
2011-12-05  Junio C HamanoMerge branch 'na/strtoimax'
2011-12-05  Junio C HamanoMerge branch 'ab/clang-lints'
2011-12-05  Junio C HamanoMerge branch 'nd/prune-progress'
2011-12-05  Junio C HamanoMerge branch 'mf/curl-select-fdset'
2011-12-05  Junio C HamanoMerge branch 'maint-1.7.7' into maint
2011-11-28  Junio C HamanoMerge branch 'nd/maint-ignore-exclude' into nd/ignore...
2011-11-23  Junio C HamanoMerge branch 'maint' into tj/imap-send-remove-unused
2011-11-21  Junio C HamanoMerge branch 'jk/maint-1.6.2-upload-archive' into jk...
2011-11-21  Junio C HamanoMerge branch 'maint'
2011-11-18  Junio C HamanoSync with 1.7.7.4
2011-11-18  Junio C HamanoMerge branch 'jc/maint-name-rev-all' into maint
2011-11-18  Junio C HamanoMerge branch 'ml/mailmap' into maint
2011-11-18  Junio C HamanoMerge branch 'jn/maint-notes-avoid-va-args' into maint
2011-11-12  Junio C HamanoMerge branch 'ly/mktree-using-strbuf'
2011-11-10  Junio C HamanoMerge "Move 'builtin-*' into a 'builtin/' subdirectory"
2011-11-10  Junio C HamanoMerge 'build-in git-mktree'
2011-11-09  Junio C HamanoMerge branch 'jc/remote-setbranches-usage-fix'
2011-11-09  Junio C HamanoMerge branch 'fc/remote-seturl-usage-fix'
2011-11-09  Junio C HamanoSync with 1.7.7.3
2011-11-09  Junio C HamanoMerge branch 'jc/maint-remove-renamed-ref' into maint
2011-11-09  Junio C HamanoMerge branch 'jm/maint-gitweb-filter-forks-fix' into...
2011-11-08  Junio C Hamanomerge: record tag objects without peeling in MERGE_HEAD
2011-11-08  Junio C HamanoMerge branch 'ss/blame-textconv-fake-working-tree'
2011-11-07  Junio C Hamanomerge: notice local merging of tags and keep it unwrapped
2011-11-07  Junio C HamanoMerge branch 'ab/i18n-test-fix'
2011-11-07  Junio C HamanoMerge branch 'sn/http-auth-with-netrc-fix'
2011-11-07  Junio C HamanoMerge branch 'pw/p4-appledouble-fix'
2011-11-01  Junio C HamanoSync with 1.7.7.2
2011-11-01  Junio C HamanoMerge branch 'md/smtp-tls-hello-again' into maint
2011-11-01  Junio C HamanoMerge branch 'jk/pull-rebase-with-work-tree' into maint
2011-11-01  Junio C HamanoMerge branch 'jc/maint-diffstat-numstat-context' into...
2011-11-01  Junio C HamanoMerge branch 'sp/smart-http-failure' into maint
2011-11-01  Junio C HamanoMerge branch 'jk/name-hash-dirent'
2011-11-01  Junio C HamanoMerge branch 'ss/blame-textconv-fake-working-tree'
2011-11-01  Junio C HamanoMerge branch 'dm/pack-objects-update'
2011-11-01  Junio C HamanoMerge branch 'nd/pretty-commit-log-message'
2011-10-31  Junio C HamanoMerge branch 'jk/git-tricks'
2011-10-27  Junio C HamanoMerge branch 'rj/gitweb-clean-js'
2011-10-27  Junio C HamanoMerge branch 'maint'
2011-10-26  Junio C HamanoMerge branch 'maint'
2011-10-26  Junio C HamanoMerge branch 'tc/submodule-clone-name-detection'
2011-10-26  Junio C HamanoMerge branch 'lh/gitweb-site-html-head'
2011-10-26  Junio C HamanoMerge branch 'mm/mediawiki-author-fix'
2011-10-26  Junio C HamanoMerge branch 'jn/libperl-git-config'
2011-10-26  Junio C HamanoMerge branch 'jm/maint-gitweb-filter-forks-fix'
2011-10-26  Junio C HamanoMerge branch 'cn/fetch-prune'
2011-10-26  Junio C HamanoMerge branch 'ps/gitweb-js-with-lineno' into maint...
2011-10-26  Junio C HamanoMerge branch 'maint-1.7.5' into maint-1.7.6
2011-10-26  Junio C HamanoMerge branch 'maint-1.7.4' into maint-1.7.5
2011-10-26  Junio C HamanoMerge branch 'maint-1.7.3' into maint-1.7.4
2011-10-26  Junio C HamanoMerge branch 'sn/doc-update-index-assume-unchanged...
2011-10-24  Junio C HamanoMerge branch 'maint'
2011-10-24  Junio C HamanoMerge branch 'maint-1.7.3' into maint
2011-10-24  Junio C HamanoMerge branch 'maint'
2011-10-21  Junio C HamanoMerge branch 'po/insn-editor'
2011-10-21  Junio C HamanoMerge branch 'jc/broken-ref-dwim-fix'
2011-10-21  Junio C HamanoMerge branch 'mh/ref-api'
2011-10-21  Junio C HamanoMerge branch 'jc/match-refs-clarify'
2011-10-21  Junio C HamanoMerge branch 'jc/make-tags'
2011-10-21  Junio C HamanoMerge branch 'ss/inet-ntop'
2011-10-21  Junio C HamanoMerge branch 'jc/maint-remove-renamed-ref'
2011-10-21  Junio C HamanoMerge branch 'pw/p4-update'
next