Merge branch 'tr/test-commit-only-on-orphan'
[gitweb.git] / mergetools / p4merge
2013-06-11 Merge branch 'tr/test-commit-only-on-orphan'
2013-06-10 Merge branch 'jn/config-ignore-inaccessible' into maint
2013-06-06 Merge branch 'sb/archive-zip-double-assignment-fix'
2013-06-05 Merge branch 'rs/commit-m-no-edit'
2013-06-05 Merge branch 'nd/urls-doc-no-file-hyperlink-fix'
2013-06-05 Merge branch 'tr/push-no-verify-doc'
2013-06-05 Merge branch 'tg/maint-zsh-svn-remote-prompt'
2013-06-05 Merge branch 'jc/core-checkstat'
2013-06-02 Merge branch 'tr/line-log'
2013-06-02 Merge branch 'mk/combine-diff-context-horizon-fix'
2013-06-02 Merge branch 'jc/t5551-posix-sed-bre'
2013-06-02 Merge branch 'fc/macos-x-clipped-write'
2013-06-02 Merge branch 'nd/clone-local-with-colon'
2013-06-02 Merge branch 'rs/empty-archive'
2013-06-02 Merge branch 'rh/merge-options-doc-fix'
2013-06-02 Merge branch 'an/diff-index-doc'
2013-05-29 Merge branch 'maint-1.8.2' into maint
2013-05-29 Merge branch 'jn/config-ignore-inaccessible'
2013-05-29 Merge branch 'jk/lookup-object-prefer-latest'
2013-05-29 Merge branch 'jk/subtree-do-not-push-if-split-fails'
2013-05-29 Merge branch 'jk/test-output'
2013-05-29 Merge branch 'mh/packed-refs-various'
2013-05-29 Merge branch 'as/check-ignore'
2013-05-29 Merge branch 'jc/prune-all'
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 'tr/copy-revisions-from-stdin' into maint
2013-05-07 Merge branch 'jk/merge-tree-added-identically'
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 'jk/check-corrupt-objects-carefully'
2013-04-28 Merge branch 'jk/merge-tree-added-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 Sync with 1.8.2.2
2013-04-24 Sync with maint
2013-04-24 Merge branch 'jk/diff-algo-finishing-touches' into...
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-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 'jc/add-2.0-delete-default' (early part)
2013-04-22 Merge branch 'jk/chopped-ident'
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 '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'
2013-04-19 Merge branch 'tr/copy-revisions-from-stdin'
2013-04-19 Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early...
2013-04-19 Merge branch 'mv/ssl-ftp-curl'
2013-04-18 Merge branch 'maint'
2013-04-18 Merge branch 'jk/test-trash'
2013-04-18 Merge branch 'th/t9903-symlinked-workdir'
2013-04-18 Merge branch 'jk/merge-tree-added-identically'
2013-04-18 Merge branch 'jk/http-dumb-namespaces'
2013-04-18 Merge branch 'rs/empty-archive'
2013-04-18 Merge branch 'jc/push-2.0-default-to-simple' (early...
2013-04-18 Merge branch 'jk/daemon-user-doc'
2013-04-18 Merge branch 'jc/detached-head-doc'
2013-04-18 Merge branch 'tr/packed-object-info-wo-recursion'
2013-04-16 Merge branch 'maint'
2013-04-15 Merge branch 'jk/diff-algo-finishing-touches'
2013-04-15 Merge branch 'rt/commentchar-fmt-merge-msg'
2013-04-15 Merge branch 'lf/bundle-with-tip-wo-message'
2013-04-15 Merge branch 'jk/show-branch-strbuf'
2013-04-15 Merge branch 'tr/perl-keep-stderr-open'
2013-04-12 Sync with 'maint'
2013-04-12 Merge branch 'jk/diffcore-break-divzero' into maint
2013-04-12 Merge branch 'cn/commit-amend-doc' into maint
2013-04-12 Merge branch 'jk/bisect-prn-unsigned' into maint
2013-04-12 Merge branch 'tb/document-status-u-tradeoff' into maint
2013-04-12 Merge branch 'maint'
2013-04-12 Merge branch 'ap/combine-diff-coalesce-lost'
2013-04-12 Merge branch 'sr/log-SG-no-textconv'
2013-04-12 Merge branch 'js/rerere-forget-protect-against-NUL'
2013-04-07 Sync with 1.8.2.1
2013-04-07 Merge branch 'jk/rm-removed-paths'
2013-04-07 Merge branch 'tb/shared-perm'
2013-04-07 Merge branch 'cn/commit-amend-doc'
2013-04-07 Merge branch 'mg/texinfo-5'
next