am --skip: revert changes introduced by failed 3way merge
[gitweb.git] / Documentation / git-difftool.txt
2015-01-12 Merge branch 'jk/read-packed-refs-without-path-max...
2015-01-12 Merge branch 'mh/find-uniq-abbrev' into maint
2015-01-12 Merge branch 'jk/approxidate-avoid-y-d-m-over-future...
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-12 Merge branch 'jk/for-each-reflog-ent-reverse' into...
2015-01-07 Merge branch 'maint-2.1' into maint
2014-12-22 Merge branch 'jk/rebuild-perl-scripts-with-no-perl...
2014-12-22 Merge branch 'po/everyday-doc' into maint
2014-12-22 Merge branch 'jk/push-simple' into maint
2014-12-22 Merge branch 'mh/config-flip-xbit-back-after-checking...
2014-12-22 Merge branch 'jk/gitweb-with-newer-cgi-multi-param...
2014-12-22 Merge branch 'rs/receive-pack-use-labs' into maint
2014-12-22 Merge branch 'rs/maint-config-use-labs' into maint
2014-12-22 Merge branch 'js/windows-open-eisdir-error' into maint
2014-12-22 Merge branch 'jk/colors-fix' into maint
2014-12-22 Merge branch 'jk/checkout-from-tree' into maint
2014-12-17 Sync with v2.1.4
2014-11-19 Merge branch 'sv/submitting-final-patch'
2014-11-19 Merge branch 'sn/tutorial-status-output-example'
2014-11-19 Merge branch 'mh/doc-remote-helper-xref'
2014-11-19 Merge branch 'tb/no-relative-file-url'
2014-11-19 Merge branch 'cc/interpret-trailers'
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-11-12 Sync with 'maint'
2014-11-12 Merge branch 'jk/fetch-reflog-df-conflict'
2014-11-11 Sync with maint
2014-11-11 Merge branch 'rs/clean-menu-item-defn' into maint
2014-11-10 Sync with maint
2014-11-10 Merge branch 'js/diff-highlight-avoid-sigpipe'
2014-11-06 Merge branch 'maint'
2014-11-06 Merge branch 'nd/gitignore-trailing-whitespace'
2014-11-06 Merge branch 'tm/line-log-first-parent'
2014-11-06 Merge branch 'jk/fetch-reflog-df-conflict'
2014-11-06 Merge branch 'rs/use-child-process-init-more'
2014-11-06 Merge branch 'jk/cache-tree-protect-from-broken-libgit2'
2014-10-31 Merge branch 'for-junio' of git://bogomips.org/git-svn
2014-10-31 Merge branch 'jc/push-cert'
2014-10-31 Merge branch 'rs/child-process-init'
2014-10-31 Merge branch 'rs/grep-color-words'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Sync with Git 2.1.3
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-29 Merge branch 'da/difftool'
2014-10-28 difftool: add support for --trust-exit-code
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-09-09 Merge branch 'rs/clean-menu-item-defn'
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
2014-06-26 Merge git://repo.or.cz/git-gui
2014-06-25 Merge branch 'rr/rebase-autostash-fix' into maint
2014-06-16 Merge branch 'rr/rebase-autostash-fix'
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-04-09 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09 Merge commit 'doc/http-backend: missing accent grave...
2014-04-08 Merge branch 'jk/commit-dates-parsing-fix'
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-18 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18 Merge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint
2014-03-18 Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-14 Merge branch 'jk/commit-dates-parsing-fix'
2014-03-14 Merge branch 'jc/check-attr-honor-working-tree'
2014-03-07 Merge branch 'jc/hold-diff-remove-q-synonym-for-no...
2014-03-07 Merge branch 'jc/core-checkstat-2.0'
2014-03-07 Merge branch 'jc/add-2.0-ignore-removal'
2014-03-07 Merge branch 'jn/add-2.0-u-A-sans-pathspec'
2014-03-07 Merge branch 'jc/push-2.0-default-to-simple'
2014-02-27 Merge branch 'bs/stdio-undef-before-redef'
2014-02-27 Merge branch 'jk/config-path-include-fix'
2014-02-13 Merge branch 'jc/revision-range-unpeel' into maint
2014-02-05 Merge branch 'jc/maint-pull-docfix' into maint
2014-01-27 Merge branch 'jc/revision-range-unpeel'
2014-01-27 Merge branch 'jc/maint-pull-docfix'
2014-01-23 Merge git://ozlabs.org/~paulus/gitk
2014-01-21 Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14 Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2014-01-13 Merge branch 'jk/t5531-prepare-to-default-to-non-matching'
2013-12-17 Merge branch 'jk/two-way-merge-corner-case-fix' into...
2013-12-09 Merge git://repo.or.cz/git-gui
2013-12-09 Merge git://ozlabs.org/~paulus/gitk
2013-12-05 Merge branch 'jk/two-way-merge-corner-case-fix'
2013-12-05 Merge branch 'jk/replace-perl-in-built-scripts'
2013-11-07 Merge branch 'vd/doc-unpack-objects' into maint
2013-11-07 Merge branch 'hn/log-graph-color-octopus' into maint
2013-11-07 Merge branch 'jc/revision-range-unpeel' into maint
2013-11-04 Merge branch 'vd/doc-unpack-objects'
2013-11-04 Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
2013-10-30 Merge branch 'jk/refs-c-squelch-gcc'
2013-10-30 Merge branch 'jk/date-c-double-semicolon'
2013-10-30 Merge branch 'nd/gc-lock-against-each-other'
2013-10-30 Merge branch 'hn/log-graph-color-octopus'
2013-10-30 Merge branch 'sg/t3600-nul-sha1-fix'
2013-10-28 Merge branch 'ew/keepalive'
2013-10-28 Merge branch 'jc/revision-range-unpeel'
2013-10-28 Merge branch 'jx/relative-path-regression-fix'
2013-10-28 Merge branch 'jk/diff-algo' into maint
2013-10-23 Merge branch 'jh/checkout-auto-tracking' into maint
next