Merge branch 'jk/colors'
[git] / mergetools / diffmerge
2014-12-22  Junio C HamanoMerge branch 'jk/colors'
2014-12-22  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date'
2014-12-22  Junio C HamanoMerge branch 'js/test-hashmap-squelch-gcc'
2014-12-22  Junio C HamanoMerge branch 'js/fsck-tag-validation'
2014-12-22  Junio C HamanoMerge branch 'po/doc-assume-unchanged'
2014-12-22  Junio C HamanoMerge branch 'mg/branch-d-m-f'
2014-12-22  Junio C HamanoMerge branch 'tb/t0027-eol-conversion'
2014-12-22  Junio C HamanoMerge branch 'jk/for-each-reflog-ent-reverse'
2014-12-22  Junio C HamanoMerge branch 'sb/string-list'
2014-12-22  Junio C HamanoMerge branch 'sv/doc-stripspace'
2014-12-22  Junio C HamanoMerge branch 'rt/completion-tag'
2014-12-22  Junio C HamanoMerge branch 'mg/doc-check-ignore-tracked-are-not-ignored'
2014-12-22  Junio C HamanoMerge branch 'jk/credential-quit'
2014-12-22  Junio C HamanoMerge branch 'dm/compat-s-ifmt-for-zos'
2014-12-22  Junio C HamanoMerge branch 'ps/new-workdir-into-empty-directory'
2014-12-22  Junio C HamanoMerge branch 'nd/ls-tree-pathspec'
2014-12-22  Junio C HamanoMerge branch 'jc/hook-cleanup'
2014-12-22  Junio C HamanoMerge branch 'rt/for-each-ref-spell-tcl-as-Tcl'
2014-12-22  Junio C HamanoMerge branch 'rj/t0050-passes'
2014-12-22  Junio C HamanoMerge branch 'js/push-to-deploy'
2014-12-22  Junio C HamanoMerge branch 'jc/exec-cmd-system-path-leak-fix'
2014-12-22  Junio C HamanoMerge branch 'mh/find-uniq-abbrev'
2014-12-22  Junio C HamanoMerge branch 'pb/send-email-te'
2014-12-22  Junio C HamanoMerge branch 'pb/am-message-id-footer'
2014-12-22  Junio C HamanoMerge branch 'mh/simplify-repack-without-refs'
2014-12-22  Junio C HamanoMerge branch 'dw/shell-basename-dashdash-before-strippi...
2014-12-22  Junio C HamanoMerge branch 'rj/no-xopen-source-for-cygwin'
2014-12-22  Junio C HamanoMerge branch 'js/t5000-dont-copy-bin-sh'
2014-12-22  Junio C HamanoMerge branch 'jc/refer-to-t-readme-from-submitting...
2014-12-22  Junio C HamanoMerge branch 'tb/config-core-filemode-check-on-broken-fs'
2014-12-22  Junio C HamanoMerge branch 'mg/add-ignore-errors'
2014-12-22  Junio C HamanoMerge branch 'jk/lock-ref-sha1-basic-return-errors'
2014-12-22  Junio C HamanoMerge branch 'cc/interpret-trailers-more'
2014-12-18  Junio C HamanoSync with v2.2.1
2014-12-12  Junio C HamanoMerge branch 'jk/pack-bitmap'
2014-12-12  Junio C HamanoMerge branch 'jk/push-simple'
2014-12-12  Junio C HamanoMerge branch 'da/difftool-mergetool-simplify-reporting...
2014-11-21  David Aguilarmergetools: stop setting $status in merge_cmd()
2014-11-18  Junio C HamanoMerge branch 'jc/doc-commit-only'
2014-11-11  Junio C HamanoMerge branch 'rs/clean-menu-item-defn' into maint
2014-11-06  Junio C HamanoMerge branch 'tm/line-log-first-parent'
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30  Junio C HamanoMerge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix'
2014-09-09  Junio C HamanoMerge branch 'rs/clean-menu-item-defn'
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-06-26  Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui
2014-06-25  Junio C HamanoMerge branch 'rr/rebase-autostash-fix' into maint
2014-06-25  Junio C HamanoMerge branch 'jc/shortlog-ref-exclude' into maint
2014-06-20  Junio C HamanoMerge branch 'tb/t5551-clone-notice-to-stderr'
2014-06-16  Junio C HamanoMerge branch 'rr/rebase-autostash-fix'
2014-06-09  Junio C HamanoMerge branch 'jc/shortlog-ref-exclude'
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-05-08  Junio C HamanoMerge branch 'cl/p4-use-diff-tree' into maint
2014-05-07  Junio C HamanoMerge branch 'cl/p4-use-diff-tree'
2014-04-09  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09  Junio C HamanoMerge commit 'doc/http-backend: missing accent grave...
2014-04-08  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix'
2014-04-03  Junio C HamanoMerge branch 'mh/remove-subtree-long-pathname-fix'...
2014-04-03  Junio C HamanoMerge branch 'jc/stash-pop-not-popped' into maint
2014-03-31  Junio C HamanoMerge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-31  Junio C HamanoMerge branch 'dw/doc-status-no-longer-shows-pound-prefix'
2014-03-25  Junio C HamanoMerge branch 'dm/configure-iconv-locale-charset'
2014-03-25  Junio C HamanoMerge branch 'mh/remove-subtree-long-pathname-fix'
2014-03-25  Junio C HamanoMerge branch 'cp/am-patch-format-doc'
2014-03-21  Junio C HamanoMerge branch 'es/sh-i18n-envsubst'
2014-03-21  Junio C HamanoMerge branch 'jc/stash-pop-not-popped'
2014-03-18  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18  Junio C HamanoMerge branch 'tr/diff-submodule-no-reuse-worktree'...
2014-03-18  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18  Junio C HamanoMerge branch 'bk/refresh-missing-ok-in-merge-recursive...
2014-03-18  Junio C HamanoMerge branch 'jk/config-path-include-fix' into maint
2014-03-18  Junio C HamanoMerge branch 'nd/diff-quiet-stat-dirty' into maint
2014-03-18  Junio C HamanoMerge branch 'mh/simplify-cache-tree-find'
2014-03-18  Junio C HamanoMerge branch 'jn/branch-lift-unnecessary-name-length...
2014-03-18  Junio C HamanoMerge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-14  Junio C HamanoMerge branch 'sh/write-pack-file-warning-message-fix'
2014-03-14  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix'
2014-03-14  Junio C HamanoMerge branch 'jh/note-trees-record-blobs'
2014-03-14  Junio C HamanoMerge branch 'tr/diff-submodule-no-reuse-worktree'
2014-03-14  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree'
2014-03-07  Junio C HamanoMerge branch 'jc/hold-diff-remove-q-synonym-for-no...
2014-03-07  Junio C HamanoMerge branch 'jc/core-checkstat-2.0'
2014-03-07  Junio C HamanoMerge branch 'jc/add-2.0-ignore-removal'
2014-03-07  Junio C HamanoMerge branch 'jn/add-2.0-u-A-sans-pathspec'
2014-03-07  Junio C HamanoMerge branch 'jc/push-2.0-default-to-simple'
2014-03-03  Junio C HamanoMerge branch 'sh/write-pack-file-warning-message-fix...
2014-02-27  Junio C HamanoMerge branch 'nd/test-rename-reset'
2014-02-27  Junio C HamanoMerge branch 'bs/stdio-undef-before-redef'
2014-02-27  Junio C HamanoMerge branch 'jk/config-path-include-fix'
2014-02-27  Junio C HamanoMerge branch 'nd/diff-quiet-stat-dirty'
2014-02-27  Junio C HamanoMerge branch 'bk/refresh-missing-ok-in-merge-recursive'
2014-02-13  Junio C HamanoMerge branch 'bm/merge-base-octopus-dedup' into maint
2014-02-13  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2014-02-13  Junio C HamanoMerge branch 'jk/allow-fetch-onelevel-refname' into...
2014-02-13  Junio C HamanoMerge branch 'sb/repack-in-c' into maint
next