Merge branch 'da/mergetool-xxdiff-hotkey'
[gitweb.git] / mergetools / p4merge
2016-12-19 Merge branch 'da/mergetool-xxdiff-hotkey'
2016-12-19 Merge branch 'lr/doc-fix-cet'
2016-12-19 Merge branch 'sb/t3600-cleanup'
2016-12-19 Merge branch 'jc/pull-rebase-ff'
2016-12-19 Merge branch 'ld/p4-worktree'
2016-12-19 Merge branch 'jk/make-tags-find-sources-tweak'
2016-12-19 Merge branch 'js/normalize-path-copy-ceil'
2016-12-19 Merge branch 'bb/unicode-9.0'
2016-12-19 Merge branch 'jk/readme-gmane-is-no-more'
2016-12-19 Merge branch 'jc/lock-report-on-error'
2016-12-19 Merge branch 'jk/xdiff-drop-xdl-fast-hash'
2016-12-19 Merge branch 'nd/rebase-forget'
2016-12-19 Merge branch 'jk/trailers-placeholder-in-pretty'
2016-12-19 Merge branch 'ak/commit-only-allow-empty'
2016-12-19 Merge branch 'da/difftool-dir-diff-fix'
2016-12-19 Merge branch 'jb/diff-no-index-no-abbrev'
2016-12-19 Merge branch 'rj/git-version-gen-do-not-force-abbrev'
2016-12-19 Merge branch 'jk/stash-disable-renames-internally'
2016-12-19 Merge branch 'jk/http-walker-limit-redirect'
2016-12-19 Merge branch 'jk/http-walker-limit-redirect-2.9'
2016-12-19 Merge branch 'nd/for-each-ref-ignore-case'
2016-12-19 Merge branch 'sb/unpack-trees-grammofix'
2016-12-19 Merge branch 'ls/travis-update-p4-and-lfs'
2016-12-19 Merge branch 'ls/t0021-fixup'
2016-12-19 Merge branch 'ah/grammos'
2016-12-19 Merge branch 'jc/renormalize-merge-kill-safer-crlf'
2016-12-19 Merge branch 'jt/use-trailer-api-in-commands'
2016-12-16 Merge branch 'ls/p4-retry-thrice'
2016-12-16 Merge branch 'ls/p4-empty-file-on-lfs'
2016-12-16 Merge branch 'ld/p4-update-shelve'
2016-12-16 Merge branch 'vk/p4-submit-shelve'
2016-12-16 Merge branch 'da/mergetool-trust-exit-code'
2016-11-29 mergetool: honor mergetool.$tool.trustExitCode for...
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-26 Merge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26 Merge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-11 Merge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09 Merge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07 Merge branch 'sy/i18n' of git-gui
2016-08-31 Merge branch 'ls/packet-line-protocol-doc-fix'
2016-07-28 Merge branch 'js/t3404-grammo-fix' into maint
2016-07-13 Merge branch 'js/t3404-grammo-fix'
2016-07-11 Merge branch 'cb/t7810-test-label-fix' into maint
2016-07-06 Merge branch 'cb/t7810-test-label-fix'
2016-05-26 Merge branch 'va/mailinfo-doc-typofix' into maint
2016-05-18 Merge branch 'rn/glossary-typofix' into HEAD
2016-05-17 Merge branch 'va/mailinfo-doc-typofix'
2016-05-10 Merge branch 'rn/glossary-typofix'
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-02-22 Merge branch 'jk/config-include'
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30 Merge git://ozlabs.org/~paulus/gitk
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
2015-09-02 Merge branch 'ee/clean-test-fixes'
2015-09-01 Merge branch 'ah/reflog-typofix-in-error'
2015-09-01 Merge branch 'ah/read-tree-usage-string'
2015-09-01 Merge branch 'ah/pack-objects-usage-strings'
2015-08-26 Merge branch 'sg/t3020-typofix'
2015-07-15 Merge branch 'fk/doc-format-patch-vn' into maint
2015-06-24 Merge branch 'fk/doc-format-patch-vn'
2015-06-16 Merge branch 'mc/commit-doc-grammofix' into maint
2015-06-01 Merge branch 'mc/commit-doc-grammofix'
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
2015-05-13 Merge branch 'ep/fix-test-lib-functions-report' into...
2015-05-11 Merge branch 'sg/complete-decorate-full-not-long'
2015-05-06 Merge branch 'ep/fix-test-lib-functions-report'
2015-04-28 Merge branch 'mg/show-notes-doc'
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14 Merge branch 'sb/plug-streaming-leak'
2015-04-14 Merge branch 'jz/gitweb-conf-doc-fix'
2015-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'tc/missing-http-proxyauth'
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-25 Merge branch 'jk/status-read-branch-name-fix' into...
2015-02-17 Merge branch 'jk/status-read-branch-name-fix'
2015-02-17 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-07 Merge branch 'sb/t5400-remove-unused'
2015-01-07 Merge branch 'pd/completion-filenames-fix'
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date'
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14 Merge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix'
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27 Merge git://ozlabs.org/~paulus/gitk
2014-06-26 Merge early parts from git://ozlabs.org/~paulus/gitk.git
next