Merge branch 'sb/test-bitmap-free-at-end'
[git] / Documentation / git-difftool.txt
2014-12-22  Junio C HamanoMerge branch 'rj/t0050-passes'
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 '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 'cc/interpret-trailers-more'
2014-12-22  Junio C HamanoMerge branch 'jk/rebuild-perl-scripts-with-no-perl...
2014-12-22  Junio C HamanoMerge branch 'po/everyday-doc' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/push-simple' into maint
2014-12-22  Junio C HamanoMerge branch 'mh/config-flip-xbit-back-after-checking...
2014-12-22  Junio C HamanoMerge branch 'jk/gitweb-with-newer-cgi-multi-param...
2014-12-22  Junio C HamanoMerge branch 'rs/receive-pack-use-labs' into maint
2014-12-22  Junio C HamanoMerge branch 'rs/maint-config-use-labs' into maint
2014-12-22  Junio C HamanoMerge branch 'js/windows-open-eisdir-error' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/colors-fix' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/checkout-from-tree' into maint
2014-12-17  Junio C HamanoSync with v2.1.4
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 'jk/colors-fix'
2014-12-12  Junio C HamanoMerge branch 'rt/push-recurse-submodule-usage-string'
2014-12-12  Junio C HamanoMerge branch 'jk/rebuild-perl-scripts-with-no-perl...
2014-12-12  Junio C HamanoMerge branch 'sv/typofix-apply-error-message'
2014-12-12  Junio C HamanoMerge branch 'po/everyday-doc'
2014-12-12  Junio C HamanoMerge branch 'jc/unpack-trees-plug-leak'
2014-12-05  Junio C HamanoMerge branch 'mh/config-flip-xbit-back-after-checking'
2014-12-05  Junio C HamanoMerge branch 'jk/gitweb-with-newer-cgi-multi-param'
2014-12-05  Junio C HamanoMerge branch 'rs/receive-pack-use-labs'
2014-12-05  Junio C HamanoMerge branch 'rs/maint-config-use-labs'
2014-12-05  Junio C HamanoMerge branch 'js/windows-open-eisdir-error'
2014-12-05  Junio C HamanoMerge branch 'sv/get-builtin'
2014-12-05  Junio C HamanoMerge branch 'jk/checkout-from-tree'
2014-11-19  Junio C HamanoMerge branch 'sv/submitting-final-patch'
2014-11-19  Junio C HamanoMerge branch 'sn/tutorial-status-output-example'
2014-11-19  Junio C HamanoMerge branch 'mh/doc-remote-helper-xref'
2014-11-19  Junio C HamanoMerge branch 'tb/no-relative-file-url'
2014-11-19  Junio C HamanoMerge branch 'cc/interpret-trailers'
2014-11-18  Junio C HamanoMerge branch 'jc/doc-commit-only'
2014-11-12  Junio C HamanoSync with 'maint'
2014-11-12  Junio C HamanoMerge branch 'jk/fetch-reflog-df-conflict'
2014-11-11  Junio C HamanoSync with maint
2014-11-11  Junio C HamanoMerge branch 'rs/clean-menu-item-defn' into maint
2014-11-10  Junio C HamanoSync with maint
2014-11-10  Junio C HamanoMerge branch 'js/diff-highlight-avoid-sigpipe'
2014-11-06  Junio C HamanoMerge branch 'maint'
2014-11-06  Junio C HamanoMerge branch 'nd/gitignore-trailing-whitespace'
2014-11-06  Junio C HamanoMerge branch 'tm/line-log-first-parent'
2014-11-06  Junio C HamanoMerge branch 'jk/fetch-reflog-df-conflict'
2014-11-06  Junio C HamanoMerge branch 'rs/use-child-process-init-more'
2014-11-06  Junio C HamanoMerge branch 'jk/cache-tree-protect-from-broken-libgit2'
2014-10-31  Junio C HamanoMerge branch 'for-junio' of git://bogomips.org/git-svn
2014-10-31  Junio C HamanoMerge branch 'jc/push-cert'
2014-10-31  Junio C HamanoMerge branch 'rs/child-process-init'
2014-10-31  Junio C HamanoMerge branch 'rs/grep-color-words'
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-10-29  Junio C HamanoSync with Git 2.1.3
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-29  Junio C HamanoMerge branch 'da/difftool'
2014-10-28  David Aguilardifftool: add support for --trust-exit-code
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-16  Junio C HamanoMerge branch 'rr/rebase-autostash-fix'
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
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-03-31  Junio C HamanoMerge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-18  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18  Junio C HamanoMerge branch 'jk/config-path-include-fix' into maint
2014-03-18  Junio C HamanoMerge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-14  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix'
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-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-13  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2014-02-05  Junio C HamanoMerge branch 'jc/maint-pull-docfix' into maint
2014-01-27  Junio C HamanoMerge branch 'jc/revision-range-unpeel'
2014-01-27  Junio C HamanoMerge branch 'jc/maint-pull-docfix'
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2014-01-13  Junio C HamanoMerge branch 'jk/t5531-prepare-to-default-to-non-matching'
2013-12-17  Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix' into...
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
next