Merge branch 'ap/combine-diff-ignore-whitespace'
[gitweb.git] / t / t4300-merge-tree.sh
2013-02-01 Merge branch 'jk/cvsimport-does-not-work-with-cvsps3'
2013-02-01 Merge branch 'jc/do-not-let-random-file-interfere-with...
2013-02-01 Merge branch 'as/test-cleanup'
2013-02-01 Merge branch 'jc/no-git-config-in-clone'
2013-02-01 Merge branch 'nd/fetch-depth-is-broken'
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-30 Merge branch 'nd/edit-branch-desc-while-detached' into...
2013-01-30 Merge branch 'maint'
2013-01-28 Sync with 1.8.1.2
2013-01-28 Merge branch 'tb/t0050-maint'
2013-01-28 Merge branch 'dl/am-hg-locale'
2013-01-28 Merge branch 'jc/help'
2013-01-28 Merge branch 'bc/fix-array-syntax-for-3.0-in-completion...
2013-01-25 Merge branch 'nd/retire-fnmatch'
2013-01-25 Merge branch 'jc/doc-maintainer'
2013-01-24 Merge branch 'ch/add-auto-submitted-in-sample-post...
2013-01-24 Merge branch 'as/check-ignore'
2013-01-24 Merge branch 'rs/clarify-entry-cmp-sslice'
2013-01-24 Merge branch 'jk/suppress-clang-warning'
2013-01-24 Merge branch 'cr/push-force-tag-update'
2013-01-24 Merge branch 'mh/imap-send-shrinkage'
2013-01-24 Merge branch 'mo/cvs-server-updates'
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2013-01-22 Merge branch 'mz/reset-misc'
2013-01-22 Merge branch 'nd/fix-directory-attrs-off-by-one'
2013-01-22 Merge branch 'pw/p4-branch-fixes'
2013-01-22 Merge branch 'zk/clean-report-failure'
2013-01-22 Merge branch 'ph/rebase-preserve-all-merges'
2013-01-22 Merge branch 'nd/clone-no-separate-git-dir-with-bare'
2013-01-22 Merge branch 'maint'
2013-01-21 Merge branch 'maint'
2013-01-21 Merge branch 'rt/commit-cleanup-config'
2013-01-21 Merge branch 'ap/log-mailmap'
2013-01-18 Merge branch 'ss/help-htmlpath-config-doc'
2013-01-18 Merge branch 'nd/fix-perf-parameters-in-tests'
2013-01-18 Merge branch 'nd/attr-debug-fix'
2013-01-18 Merge branch 'rs/pretty-use-prefixcmp'
2013-01-18 Merge branch 'ds/completion-silence-in-tree-path-probe'
2013-01-18 Merge branch 'jn/maint-trim-vim-contrib'
2013-01-18 Merge branch 'pe/doc-email-env-is-trumped-by-config'
2013-01-18 Merge branch 'mk/complete-tcsh'
2013-01-14 Sync with 1.8.1.1
2013-01-14 Merge branch 'jc/blame-no-follow'
2013-01-14 Merge branch 'fc/remote-testgit-feature-done'
2013-01-14 Merge branch 'nd/upload-pack-shallow-must-be-commit'
2013-01-14 Merge branch 'ap/status-ignored-in-ignored-directory'
2013-01-14 Merge branch 'nz/send-email-headers-are-case-insensitive'
2013-01-14 Merge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-12 Merge branch 'jk/maint-fast-import-doc-reorder'
2013-01-12 Merge branch 'jk/shortlog-no-wrap-doc'
2013-01-12 Merge branch 'rs/zip-with-uncompressed-size-in-the...
2013-01-12 Merge branch 'rs/zip-tests'
2013-01-12 Merge branch 'jn/xml-depends-on-asciidoc-conf'
2013-01-12 Merge branch 'jk/unify-exit-code-by-receiving-signal'
2013-01-12 Merge branch 'jc/merge-blobs'
2013-01-10 Merge branch 'ta/remove-stale-translated-tut' into...
2013-01-08 Merge branch 'ta/remove-stale-translated-tut'
2012-12-26 merge-tree: fix d/f conflicts
2012-12-26 merge-tree: add comments to clarify what these function...
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
2012-09-12 Merge branch 'da/gitk-reload-tag-contents'
2012-08-24 Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
2012-08-06 Merge branch 'jn/block-sha1' into maint
2012-08-06 Merge branch 'ms/daemon-doc-typo' into maint
2012-07-24 Merge branch 'jn/block-sha1'
2012-07-22 Merge branch 'jk/maint-commit-amend-only-no-paths'...
2012-07-22 Merge branch 'tg/maint-cache-name-compare' into maint
2012-07-22 Merge branch 'ms/daemon-doc-typo'
2012-07-16 Merge branch 'tg/maint-cache-name-compare'
2012-07-16 Merge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-11 Merge branch 'tg/maint-cache-name-compare' into tg...
2012-06-25 Merge branch 'lp/no-cmd-http-fetch'
2012-06-17 Merge branch 'js/maint-fast-export-mark-error' into...
2012-06-12 Merge branch 'js/maint-fast-export-mark-error'
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02 Merge branch 'pt/gitk'
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16 Merge branch 'th/doc-diff-submodule-option'
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix'
2011-12-28 Merge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-22 Merge branch 'jk/maint-strbuf-missing-init'
2011-12-21 Merge branch 'jl/submodule-status-failure-report' into...
2011-12-21 Merge branch 'ms/commit-cc-option-helpstring' into...
2011-12-17 Merge git://ozlabs.org/~paulus/gitk
2011-12-14 Merge branch 'jl/submodule-status-failure-report'
2011-12-14 Merge branch 'jc/maint-name-rev-all' into maint-1.7.6
2011-12-14 Merge branch 'ml/mailmap' into maint-1.7.6
2011-12-14 Merge branch 'master' of git://repo.or.cz/git-gui
2011-11-23 Merge branch 'maint' into tj/imap-send-remove-unused
2011-11-21 Merge branch 'jk/maint-1.6.2-upload-archive' into jk...
2011-11-18 Merge branch 'jc/maint-name-rev-all' into maint
2011-11-18 Merge branch 'ml/mailmap' into maint
2011-11-12 Merge branch 'ly/mktree-using-strbuf'
2011-11-09 Merge branch 'jc/remote-setbranches-usage-fix'
2011-11-09 Merge branch 'fc/remote-seturl-usage-fix'
next