Andrew's git - gitweb.git/history - Documentation/git-mergetool.txt

[gitweb.git] / Documentation / git-mergetool.txt

2018-12-01	Merge branch 'ab/replace-graft-with-replace-advice'	blob \| diff \| raw
2018-11-29	Merge branch 'nd/n18n-fix'	blob \| diff \| raw
2018-11-26	Merge branch 'nd/per-worktree-ref-iteration'	blob \| diff \| raw
2018-11-26	Merge branch 'tb/clone-case-smashing-warning-test'	blob \| diff \| raw
2018-11-26	Merge branch 'jk/t5562-perl-path-fix'	blob \| diff \| raw
2018-11-21	Sync with 2.19.2	blob \| diff \| raw
2018-11-21	Merge branch 'jk/check-everything-connected-is-long...	blob \| diff \| raw \| diff to current
2018-11-21	Merge branch 'cc/shared-index-permbits'	blob \| diff \| raw
2018-11-21	Merge branch 'nd/clone-case-smashing-warning'	blob \| diff \| raw
2018-11-21	Merge branch 'cc/delta-islands'	blob \| diff \| raw
2018-11-20	Merge branch 'master' of git://github.com/git-l10n...	blob \| diff \| raw
2018-11-19	Merge branch 'nd/format-patch-cover-letter-stat-width'	blob \| diff \| raw
2018-11-19	Merge branch 'ds/push-squelch-ambig-warning'	blob \| diff \| raw
2018-11-18	Merge branch 'jk/close-duped-fd-before-unlock-for-bundle'	blob \| diff \| raw
2018-11-18	Merge branch 'js/fuzz-cxxflags'	blob \| diff \| raw
2018-11-18	Merge branch 'js/mingw-msdn-url'	blob \| diff \| raw
2018-11-18	Merge branch 'cb/notes-freeing-always-null-fix'	blob \| diff \| raw
2018-11-18	Merge branch 'js/apply-recount-allow-noop'	blob \| diff \| raw
2018-11-18	Merge branch 'ra/rev-parse-exclude-glob'	blob \| diff \| raw
2018-11-18	Merge branch 'js/rebase-autostash-detach-fix'	blob \| diff \| raw
2018-11-18	Merge branch 'ab/range-diff-no-patch'	blob \| diff \| raw
2018-11-18	Merge branch 'jk/verify-sig-merge-into-void'	blob \| diff \| raw
2018-11-18	Merge branch 'mg/gpg-fingerprint-test'	blob \| diff \| raw
2018-11-18	Merge branch 'nd/pthreads'	blob \| diff \| raw
2018-11-18	Merge branch 'ds/reachable-topo-order'	blob \| diff \| raw
2018-11-13	Merge branch 'nd/complete-format-patch'	blob \| diff \| raw
2018-11-13	Merge branch 'nd/tree-walk-path-exclusion'	blob \| diff \| raw
2018-11-13	Merge branch 'sg/travis-install-dependencies'	blob \| diff \| raw
2018-11-13	Merge branch 'jk/xdiff-interface'	blob \| diff \| raw
2018-11-13	Merge branch 'nd/per-worktree-ref-iteration'	blob \| diff \| raw
2018-11-13	Merge branch 'bp/refresh-index-using-preload'	blob \| diff \| raw
2018-11-13	Merge branch 'ag/rebase-i-in-c'	blob \| diff \| raw
2018-11-13	Merge branch 'al/send-email-auto-cte-fixup'	blob \| diff \| raw
2018-11-13	Merge branch 'pw/am-rebase-read-author-script'	blob \| diff \| raw
2018-11-13	Merge branch 'jc/war-on-string-list'	blob \| diff \| raw
2018-11-13	Merge branch 'ag/rev-parse-all-exclude-fix'	blob \| diff \| raw
2018-11-13	Merge branch 'jt/tighten-fetch-proto-v2-response'	blob \| diff \| raw
2018-11-13	Merge branch 'ao/submodule-wo-gitmodules-checked-out'	blob \| diff \| raw
2018-11-13	Merge branch 'ma/sequencer-do-reset-saner-loop-termination'	blob \| diff \| raw
2018-11-13	Merge branch 'js/mingw-utf8-env'	blob \| diff \| raw
2018-11-13	Merge branch 'ab/pack-tests-cleanup'	blob \| diff \| raw
2018-11-13	Merge branch 'ds/test-multi-pack-index'	blob \| diff \| raw
2018-11-13	Merge branch 'nd/wildmatch-double-asterisk'	blob \| diff \| raw
2018-11-13	Merge branch 'nd/per-worktree-config'	blob \| diff \| raw
2018-11-13	Merge branch 'jk/stream-pack-non-delta-clarification'	blob \| diff \| raw
2018-11-13	Merge branch 'jk/proto-v2-ref-prefix-fix'	blob \| diff \| raw
2018-11-13	Merge branch 'jk/detect-truncated-zlib-input'	blob \| diff \| raw
2018-11-13	Merge branch 'nd/config-split'	blob \| diff \| raw
2018-11-06	Merge branch 'sg/test-verbose-log'	blob \| diff \| raw
2018-11-06	Merge branch 'rj/header-cleanup'	blob \| diff \| raw
2018-11-06	Merge branch 'ss/travis-ci-force-vm-mode'	blob \| diff \| raw
2018-11-06	Merge branch 'sg/test-rebase-editor-fix'	blob \| diff \| raw
2018-11-06	Merge branch 'tb/char-may-be-unsigned'	blob \| diff \| raw
2018-11-06	Merge branch 'js/mingw-ns-filetime'	blob \| diff \| raw
2018-11-06	Merge branch 'md/exclude-promisor-objects-fix'	blob \| diff \| raw
2018-11-06	Merge branch 'jw/send-email-no-auth'	blob \| diff \| raw
2018-11-06	Merge branch 'nd/submodule-unused-vars'	blob \| diff \| raw
2018-11-06	Merge branch 'nd/unpack-trees-with-cache-tree'	blob \| diff \| raw
2018-11-06	Merge branch 'nd/completion-negation'	blob \| diff \| raw
2018-11-06	Merge branch 'jt/upload-pack-v2-fix-shallow'	blob \| diff \| raw
2018-11-06	Merge branch 'sb/submodule-url-to-absolute'	blob \| diff \| raw
2018-11-06	Merge branch 'js/shallow-and-fetch-prune'	blob \| diff \| raw
2018-11-06	Merge branch 'js/remote-archive-dwimfix'	blob \| diff \| raw
2018-11-02	Merge branch 'jc/http-curlver-warnings'	blob \| diff \| raw
2018-11-02	Merge branch 'js/mingw-http-ssl'	blob \| diff \| raw
2018-11-02	Merge branch 'mg/gpg-fingerprint'	blob \| diff \| raw
2018-11-02	Merge branch 'mg/gpg-parse-tighten'	blob \| diff \| raw
2018-11-02	Merge branch 'en/merge-cleanup-more'	blob \| diff \| raw
2018-11-02	Merge branch 'js/rebase-i-shortopt'	blob \| diff \| raw
2018-11-02	Merge branch 'js/rebase-i-break'	blob \| diff \| raw
2018-11-02	Merge branch 'js/rebase-autostash-fix'	blob \| diff \| raw
2018-11-02	Merge branch 'cb/printf-empty-format'	blob \| diff \| raw
2018-11-02	Merge branch 'jc/rebase-in-c-5-test-typofix'	blob \| diff \| raw
2018-11-02	Merge branch 'pk/rebase-in-c-6-final'	blob \| diff \| raw
2018-11-02	Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i...	blob \| diff \| raw
2018-11-02	Merge branch 'pk/rebase-in-c-5-test'	blob \| diff \| raw
2018-11-02	Merge branch 'pk/rebase-in-c-4-opts'	blob \| diff \| raw
2018-11-02	Merge branch 'pk/rebase-in-c-3-acts'	blob \| diff \| raw
2018-11-02	Merge branch 'pk/rebase-in-c-2-basic'	blob \| diff \| raw
2018-11-02	Merge branch 'ag/rebase-i-in-c'	blob \| diff \| raw
2018-11-02	Merge branch 'pk/rebase-in-c'	blob \| diff \| raw
2018-10-30	Merge branch 'jk/uploadpack-packobjectshook-fix'	blob \| diff \| raw
2018-10-30	Merge branch 'uk/merge-subtree-doc-update'	blob \| diff \| raw
2018-10-30	Merge branch 'cb/compat-mmap-is-private-read-only'	blob \| diff \| raw
2018-10-30	Merge branch 'dl/mergetool-gui-option'	blob \| diff \| raw
2018-10-25	mergetool: accept -g/--[no-]gui as arguments	blob \| diff \| raw
2018-10-16	Merge branch 'jk/check-everything-connected-is-long...	blob \| diff \| raw \| diff to current
2018-08-27	Merge branch 'sg/t7501-thinkofix'	blob \| diff \| raw \| diff to current
2018-08-27	Merge branch 'sg/t0020-conversion-fix'	blob \| diff \| raw \| diff to current
2018-08-27	Merge branch 'sg/t4051-fix'	blob \| diff \| raw \| diff to current
2018-08-20	Merge branch 'js/typofixes'	blob \| diff \| raw \| diff to current
2018-08-15	Merge branch 'sb/histogram-less-memory'	blob \| diff \| raw \| diff to current
2018-05-30	Merge branch 'rs/no-null-ptr-arith-in-fast-export'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'ab/git-svn-get-record-typofix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'js/t5404-path-fix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'mn/send-email-credential-doc'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'ak/bisect-doc-typofix'	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'sb/status-doc-fix' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'cl/t9001-cleanup' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'nd/diff-flush-before-warning' into maint	blob \| diff \| raw \| diff to current
next