git.oblomov.eu Git - git/history - Documentation/git-mergetool.txt

[git] / Documentation / git-mergetool.txt

2018-11-13	Junio C Hamano	Merge branch 'al/send-email-auto-cte-fixup'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'pw/am-rebase-read-author-script'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'jc/war-on-string-list'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'ag/rev-parse-all-exclude-fix'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'jt/tighten-fetch-proto-v2-response'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'ao/submodule-wo-gitmodules-checked-out'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'ma/sequencer-do-reset-saner-loop-termination'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'js/mingw-utf8-env'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'ab/pack-tests-cleanup'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'ds/test-multi-pack-index'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'nd/wildmatch-double-asterisk'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'nd/per-worktree-config'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'jk/stream-pack-non-delta-clarification'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'jk/proto-v2-ref-prefix-fix'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'jk/detect-truncated-zlib-input'	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'nd/config-split'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'sg/test-verbose-log'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'rj/header-cleanup'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'ss/travis-ci-force-vm-mode'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'sg/test-rebase-editor-fix'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'tb/char-may-be-unsigned'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'js/mingw-ns-filetime'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'md/exclude-promisor-objects-fix'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'jw/send-email-no-auth'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'nd/submodule-unused-vars'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'nd/unpack-trees-with-cache-tree'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'nd/completion-negation'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'jt/upload-pack-v2-fix-shallow'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'sb/submodule-url-to-absolute'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'js/shallow-and-fetch-prune'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'js/remote-archive-dwimfix'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'jc/http-curlver-warnings'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'js/mingw-http-ssl'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'mg/gpg-fingerprint'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'mg/gpg-parse-tighten'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'en/merge-cleanup-more'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'js/rebase-i-shortopt'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'js/rebase-i-break'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'js/rebase-autostash-fix'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'cb/printf-empty-format'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'jc/rebase-in-c-5-test-typofix'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'pk/rebase-in-c-6-final'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i...	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'pk/rebase-in-c-5-test'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'pk/rebase-in-c-4-opts'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'pk/rebase-in-c-3-acts'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'pk/rebase-in-c-2-basic'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'ag/rebase-i-in-c'	blob \| commitdiff \| raw
2018-11-02	Junio C Hamano	Merge branch 'pk/rebase-in-c'	blob \| commitdiff \| raw
2018-10-30	Junio C Hamano	Merge branch 'jk/uploadpack-packobjectshook-fix'	blob \| commitdiff \| raw
2018-10-30	Junio C Hamano	Merge branch 'uk/merge-subtree-doc-update'	blob \| commitdiff \| raw
2018-10-30	Junio C Hamano	Merge branch 'cb/compat-mmap-is-private-read-only'	blob \| commitdiff \| raw
2018-10-30	Junio C Hamano	Merge branch 'dl/mergetool-gui-option'	blob \| commitdiff \| raw
2018-10-25	Denton Liu	mergetool: accept -g/--[no-]gui as arguments	blob \| commitdiff \| raw
2018-10-16	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw \| diff to current
2018-08-27	Junio C Hamano	Merge branch 'sg/t7501-thinkofix'	blob \| commitdiff \| raw \| diff to current
2018-08-27	Junio C Hamano	Merge branch 'sg/t0020-conversion-fix'	blob \| commitdiff \| raw \| diff to current
2018-08-27	Junio C Hamano	Merge branch 'sg/t4051-fix'	blob \| commitdiff \| raw \| diff to current
2018-08-20	Junio C Hamano	Merge branch 'js/typofixes'	blob \| commitdiff \| raw \| diff to current
2018-08-15	Junio C Hamano	Merge branch 'sb/histogram-less-memory'	blob \| commitdiff \| raw \| diff to current
2018-05-30	Junio C Hamano	Merge branch 'rs/no-null-ptr-arith-in-fast-export'	blob \| commitdiff \| raw \| diff to current
2018-05-08	Junio C Hamano	Merge branch 'ab/git-svn-get-record-typofix'	blob \| commitdiff \| raw \| diff to current
2018-04-25	Junio C Hamano	Merge branch 'js/t5404-path-fix'	blob \| commitdiff \| raw \| diff to current
2018-04-25	Junio C Hamano	Merge branch 'mn/send-email-credential-doc'	blob \| commitdiff \| raw \| diff to current
2018-04-25	Junio C Hamano	Merge branch 'ak/bisect-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'sb/status-doc-fix' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'cl/t9001-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'nd/diff-flush-before-warning' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'dp/merge-strategy-doc-fix'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'mk/doc-pretty-fill'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'cb/ttk-style' of git-gui into cb/git...	blob \| commitdiff \| raw \| diff to current
2018-03-02	Junio C Hamano	Merge branch 'bb/ssh-key-files' of git-gui into bb...	blob \| commitdiff \| raw \| diff to current
2018-03-02	Junio C Hamano	Merge branch 'bp/bind-kp-enter' of git-gui into bp...	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'tz/do-not-clean-spec-file'	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'sb/status-doc-fix'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'bp/name-hash-dirname-fix'	blob \| commitdiff \| raw \| diff to current
2018-02-15	Junio C Hamano	Merge branch 'as/read-tree-prefix-doc-fix' into maint	blob \| commitdiff \| raw \| diff to current
2018-02-13	Junio C Hamano	Merge branch 'nd/diff-flush-before-warning'	blob \| commitdiff \| raw \| diff to current
2018-02-13	Junio C Hamano	Merge branch 'cl/t9001-cleanup'	blob \| commitdiff \| raw \| diff to current
2018-01-23	Junio C Hamano	Merge branch 'as/read-tree-prefix-doc-fix'	blob \| commitdiff \| raw \| diff to current
2018-01-09	Junio C Hamano	Merge branch 'js/misc-git-gui-stuff' of ../git-gui	blob \| commitdiff \| raw \| diff to current
2017-12-28	Junio C Hamano	Merge branch 'sr/http-sslverify-config-doc'	blob \| commitdiff \| raw \| diff to current
2017-12-27	Junio C Hamano	Merge branch 'es/clone-shared-worktree'	blob \| commitdiff \| raw \| diff to current
2017-12-27	Junio C Hamano	Merge branch 'jk/cvsimport-quoting'	blob \| commitdiff \| raw \| diff to current
2017-12-27	Junio C Hamano	Merge branch 'rs/am-builtin-leakfix'	blob \| commitdiff \| raw \| diff to current
2017-12-05	Junio C Hamano	Merge branch 'ls/no-double-utf8-author-name' of .....	blob \| commitdiff \| raw \| diff to current
2017-11-22	Junio C Hamano	Merge branch 'jn/reproducible-build' of ../git-gui...	blob \| commitdiff \| raw \| diff to current
2017-11-09	Junio C Hamano	Merge branch 'tz/fsf-address-update' of ../git-gui...	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'ex/deprecate-empty-pathspec-as-match...	blob \| commitdiff \| raw \| diff to current
2017-10-28	Junio C Hamano	Merge branch 'sg/rev-list-doc-reorder-fix'	blob \| commitdiff \| raw \| diff to current
2017-10-23	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update' into maint	blob \| commitdiff \| raw \| diff to current
2017-10-19	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update'	blob \| commitdiff \| raw \| diff to current
2017-10-18	Junio C Hamano	Merge branch 'ma/pkt-line-leakfix' into maint	blob \| commitdiff \| raw \| diff to current
2017-10-18	Junio C Hamano	Merge branch 'jc/merge-x-theirs-docfix' into maint	blob \| commitdiff \| raw \| diff to current
2017-10-18	Junio C Hamano	Merge branch 'rs/mailinfo-qp-decode-fix' into maint	blob \| commitdiff \| raw \| diff to current
2017-10-18	Junio C Hamano	Merge branch 'aw/gc-lockfile-fscanf-fix' into maint	blob \| commitdiff \| raw \| diff to current
2017-09-28	Junio C Hamano	Merge branch 'jc/merge-x-theirs-docfix'	blob \| commitdiff \| raw \| diff to current
2017-09-28	Junio C Hamano	Merge branch 'rs/mailinfo-qp-decode-fix'	blob \| commitdiff \| raw \| diff to current
2017-09-25	Junio C Hamano	Merge branch 'aw/gc-lockfile-fscanf-fix'	blob \| commitdiff \| raw \| diff to current
2017-09-22	Junio C Hamano	Sync with 2.10.5	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom