Merge branch 'dk/maint-t5150-dirname' into maint
[gitweb.git] / t / t4300-merge-tree.sh
2013-07-22 Merge branch 'dk/maint-t5150-dirname' into maint
2013-07-22 Merge branch 'dk/version-gen-gitdir' into maint
2013-07-22 Merge branch 'nk/config-local-doc' into maint
2013-07-22 Merge branch 'kb/diff-blob-blob-doc' into maint
2013-07-22 Merge branch 'mm/merge-in-dirty-worktree-doc' into...
2013-07-22 Merge branch 'ph/builtin-srcs-are-in-subdir-these-days...
2013-07-22 Merge branch 'mh/maint-lockfile-overflow' into maint
2013-07-22 Merge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19 Merge branch 'rr/name-rev-stdin-doc' into maint
2013-07-19 Merge branch 'ft/diff-rename-default-score-is-half...
2013-07-19 Merge branch 'jc/t1512-fix' into maint
2013-07-19 Merge branch 'vl/typofix' into maint
2013-07-19 Merge branch 'wk/doc-git-has-grown' into maint
2013-07-19 Merge branch 'mm/push-force-is-dangerous' into maint
2013-07-19 Merge branch 'jk/apache-test-for-2.4' into maint
2013-07-19 Merge branch 'tr/test-commit-only-on-orphan' into maint
2013-07-19 Merge branch 'sb/archive-zip-double-assignment-fix...
2013-07-19 Merge branch 'th/bisect-skip-report-range-fix' into...
2013-07-15 Merge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-15 Merge branch 'bc/http-keep-memory-given-to-curl' into...
2013-07-15 Merge branch 'jk/pull-into-dirty-unborn' into maint
2013-07-15 Merge branch 'mt/send-email-cc-match-fix' into maint
2013-07-03 Merge branch 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03 Merge branch 'fc/do-not-use-the-index-in-add-to-index...
2013-07-03 Merge branch 'jc/core-checkstat' into maint
2013-07-03 Merge branch 'jc/t5551-posix-sed-bre' into maint
2013-07-03 Merge branch 'rs/empty-archive' into maint
2013-07-03 Merge branch 'rh/merge-options-doc-fix' into maint
2013-07-03 Merge branch 'an/diff-index-doc' into maint
2013-07-03 Merge branch 'cb/log-follow-with-combined' into maint
2013-07-03 Merge branch 'maint-1.8.2' into maint
2013-06-30 Merge branch 'fc/macos-x-clipped-write' into maint
2013-06-27 Merge branch 'tg/maint-zsh-svn-remote-prompt' into...
2013-06-27 Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into...
2013-06-27 Merge branch 'tr/push-no-verify-doc' into maint
2013-06-27 Merge branch 'rs/commit-m-no-edit' into maint
2013-06-27 Merge branch 'mk/combine-diff-context-horizon-fix'...
2013-06-27 Merge branch 'jk/subtree-do-not-push-if-split-fails...
2013-06-27 Merge branch 'mh/fetch-into-shallow' into maint
2013-06-27 Merge branch 'jh/checkout-auto-tracking' into maint
2013-06-11 Merge branch 'maint-1.8.2' into maint
2013-06-10 Merge branch 'jn/config-ignore-inaccessible' into maint
2013-06-10 Merge branch 'kb/status-ignored-optim-2' into maint
2013-05-29 Merge branch 'maint-1.8.2' into maint
2013-05-17 Merge branch 'dw/asciidoc-sources-are-dot-txt-files'
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-05-09 Sync with v1.8.2.3
2013-05-09 Merge branch 'mv/sequencer-pick-error-diag'
2013-05-09 Merge branch 'tr/copy-revisions-from-stdin' into maint
2013-05-08 Merge git://github.com/git-l10n/git-po
2013-05-07 Merge branch 'jk/merge-tree-added-identically'
2013-05-07 merge-tree: handle directory/empty conflict correctly
2013-05-05 Merge branch 'fc/push-with-export-reporting-result'
2013-05-03 Merge branch 'tr/unpack-entry-use-after-free-fix'
2013-05-03 Sync with maint
2013-05-01 Merge branch 'hb/git-pm-tempfile'
2013-05-01 Merge branch 'rs/pp-user-info-without-extra-allocation'
2013-05-01 Merge branch 'tr/remote-tighten-commandline-parsing'
2013-05-01 Merge branch 'zk/prompt-rebase-step'
2013-04-29 Merge branch 'maint'
2013-04-28 Merge branch 'maint'
2013-04-28 Merge branch 'nd/pretty-formats'
2013-04-28 Merge branch 'jk/check-corrupt-objects-carefully'
2013-04-28 Merge branch 'jk/merge-tree-added-identically'
2013-04-28 merge-tree: fix typo in "both changed identically"
2013-04-26 Merge branch 'rr/shortlog-doc'
2013-04-26 Merge branch 'ph/rebase-original'
2013-04-26 Merge branch 'jn/glossary-revision'
2013-04-26 Merge branch 'fc/remote-bzr'
2013-04-26 Sync with 1.8.2.2
2013-04-24 Merge branch 'jk/remote-helper-with-signed-tags'
2013-04-24 Sync with maint
2013-04-24 Merge branch 'sr/log-SG-no-textconv' into maint
2013-04-24 Merge branch 'jc/merge-tag-object' into maint
2013-04-24 Merge git://github.com/git-l10n/git-po
2013-04-23 Merge branch 'kb/status-ignored-optim-2'
2013-04-23 Merge branch 'jn/gitweb-install-doc'
2013-04-23 Merge branch 'fc/untracked-zsh-prompt'
2013-04-23 Merge branch 'jk/receive-pack-deadlocks-with-early...
2013-04-22 Sync with maint
2013-04-22 Merge branch 'jc/detached-head-doc' into maint
2013-04-22 Merge branch 'jk/show-branch-strbuf' into maint
2013-04-22 Merge branch 'js/rerere-forget-protect-against-NUL...
2013-04-22 Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint
2013-04-22 Merge branch 'jk/suppress-clang-warning' into maint
2013-04-22 Merge branch 'jk/filter-branch-come-back-to-original...
2013-04-22 Merge branch 'as/clone-reference-with-gitfile'
2013-04-22 Merge branch 'jc/add-2.0-delete-default' (early part)
2013-04-22 Merge branch 'nd/checkout-keep-sparse'
2013-04-22 Merge branch 'jk/chopped-ident'
2013-04-22 Merge branch 'th/bisect-final-log'
2013-04-22 Merge branch 'rs/archive-zip-raw-compression'
2013-04-22 Merge branch 'ta/glossary'
2013-04-22 Merge branch 'jk/doc-http-backend'
2013-04-22 Merge branch 'jx/i18n-branch-error-messages'
2013-04-22 Merge branch 'fc/remote-hg'
2013-04-22 Merge branch 'lf/read-blob-data-from-index'
2013-04-19 Merge branch 'jk/a-thread-only-dies-once'
2013-04-19 Merge branch 'rt/commentchar-fmt-merge-msg'
next