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

[git] / Documentation / git-mergetool.txt

2016-10-31	Junio C Hamano	Merge branch 'jt/trailer-with-cruft'	blob \| commitdiff \| raw
2016-10-31	Junio C Hamano	Merge branch 'ls/filter-process'	blob \| commitdiff \| raw
2016-10-31	Junio C Hamano	Merge branch 'ls/git-open-cloexec'	blob \| commitdiff \| raw
2016-10-28	Junio C Hamano	Sync with 2.10.2	blob \| commitdiff \| raw
2016-10-27	Junio C Hamano	Merge branch 'svn-wt' of git://bogomips.org/git-svn	blob \| commitdiff \| raw
2016-10-27	Junio C Hamano	Merge branch 'nd/ita-empty-commit'	blob \| commitdiff \| raw
2016-10-27	Junio C Hamano	Merge branch 'js/prepare-sequencer'	blob \| commitdiff \| raw
2016-10-27	Junio C Hamano	Merge branch 'jk/daemon-path-ok-check-truncation'	blob \| commitdiff \| raw
2016-10-27	Junio C Hamano	Merge branch 'rs/ring-buffer-wraparound'	blob \| commitdiff \| raw
2016-10-27	Junio C Hamano	Merge branch 'sb/submodule-ignore-trailing-slash'	blob \| commitdiff \| raw
2016-10-27	Junio C Hamano	Merge branch 'jc/abbrev-auto'	blob \| commitdiff \| raw
2016-10-27	Junio C Hamano	Merge branch 'jk/abbrev-auto'	blob \| commitdiff \| raw
2016-10-27	Junio C Hamano	Merge branch 'lt/abbrev-auto'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'ex/deprecate-empty-pathspec-as-match...	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'po/fix-doc-merge-base-illustration'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'jk/tap-verbose-fix'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'mm/send-email-cc-cruft-after-address'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'yk/git-tag-remove-mention-of-old-layout...	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'jk/diff-submodule-diff-inline'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'tg/add-chmod+x-fix'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'bw/submodule-branch-dot-doc'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'pb/test-parse-options-expect'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'jk/tighten-alloc'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'va/i18n'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'jk/fetch-quick-tag-following'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'jk/merge-base-fork-point-without-reflog'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'jk/ambiguous-short-object-names'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'jk/upload-pack-use-prio-queue'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'ab/gitweb-abbrev-links'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'mg/gpg-richer-status'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'jc/cocci-xstrdup-or-null'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'mm/credential-libsecret'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'bw/ls-files-recurse-submodules'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'js/libify-require-clean-work-tree'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'jc/ws-error-highlight'	blob \| commitdiff \| raw
2016-10-26	Junio C Hamano	Merge branch 'jc/diff-unique-abbrev-comments'	blob \| commitdiff \| raw
2016-10-20	Junio C Hamano	Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2016-10-17	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2016-10-17	Junio C Hamano	Merge branch 'sb/submodule-config-doc-drop-path'	blob \| commitdiff \| raw
2016-10-17	Junio C Hamano	Merge branch 'rs/pretty-format-color-doc-fix'	blob \| commitdiff \| raw
2016-10-17	Junio C Hamano	Merge branch 'js/reset-usage'	blob \| commitdiff \| raw
2016-10-17	Junio C Hamano	Merge branch 'da/mergetool-diff-order'	blob \| commitdiff \| raw
2016-10-11	David Aguilar	mergetool: honor -O<orderfile>	blob \| commitdiff \| raw
2016-10-11	David Aguilar	mergetool: honor diff.orderFile	blob \| commitdiff \| raw \| diff to current
2016-09-29	Junio C Hamano	Merge branch 'mr/vcs-svn-printf-ulong' into maint	blob \| commitdiff \| raw \| diff to current
2016-09-26	Junio C Hamano	Merge branch 'va/i18n' of ../git-gui into va/git-gui...	blob \| commitdiff \| raw \| diff to current
2016-09-26	Junio C Hamano	Merge branch 'rs/use-modern-git-merge-syntax' of git...	blob \| commitdiff \| raw \| diff to current
2016-09-21	Junio C Hamano	Merge branch 'mr/vcs-svn-printf-ulong'	blob \| commitdiff \| raw \| diff to current
2016-09-11	Junio C Hamano	Merge branch 'js/commit-gpgsign' of ../git-gui into...	blob \| commitdiff \| raw \| diff to current
2016-09-09	Junio C Hamano	Merge branch 'ls/packet-line-protocol-doc-fix' into...	blob \| commitdiff \| raw \| diff to current
2016-09-07	Junio C Hamano	Merge branch 'sy/i18n' of git-gui	blob \| commitdiff \| raw \| diff to current
2016-08-31	Junio C Hamano	Merge branch 'ls/packet-line-protocol-doc-fix'	blob \| commitdiff \| raw \| diff to current
2016-08-03	Junio C Hamano	Merge branch 'jk/git-jump'	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'js/t3404-grammo-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'js/t3404-grammo-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'cb/t7810-test-label-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'cb/t7810-test-label-fix'	blob \| commitdiff \| raw \| diff to current
2016-06-03	Junio C Hamano	Merge branch 'pa/cherry-pick-doc-typo'	blob \| commitdiff \| raw \| diff to current
2016-05-26	Junio C Hamano	Merge branch 'va/mailinfo-doc-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'rn/glossary-typofix' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'va/mailinfo-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2016-05-10	Junio C Hamano	Merge branch 'rn/glossary-typofix'	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'ad/cygwin-wants-rename' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-22	Junio C Hamano	Merge branch 'ad/cygwin-wants-rename'	blob \| commitdiff \| raw \| diff to current
2016-04-03	Junio C Hamano	Merge branch 'jc/maint-index-pack-keep'	blob \| commitdiff \| raw \| diff to current
2016-03-21	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2016-03-14	Junio C Hamano	Merge branch 'mg/wt-status-mismarked-i18n'	blob \| commitdiff \| raw \| diff to current
2016-03-03	Junio C Hamano	Merge branch 'jc/maint-index-pack-keep' into jc/index...	blob \| commitdiff \| raw \| diff to current
2016-02-22	Junio C Hamano	Merge branch 'jk/config-include'	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'ss/clone-depth-single-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'ew/for-each-ref-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'ss/user-manual' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'nd/stop-setenv-work-tree' into maint	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'ss/clone-depth-single-doc'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'ew/for-each-ref-doc'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'ss/user-manual'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'jk/pack-revindex'	blob \| commitdiff \| raw \| diff to current
2016-01-12	Junio C Hamano	Merge branch 'nd/stop-setenv-work-tree'	blob \| commitdiff \| raw \| diff to current
2015-12-22	Junio C Hamano	Merge branch 'nd/stop-setenv-work-tree' into nd/clear...	blob \| commitdiff \| raw \| diff to current
2015-12-21	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-12-01	Jeff King	Merge branch 'rc/configure-use-libs-when-checking-a...	blob \| commitdiff \| raw \| diff to current
2015-11-25	Jeff King	Merge branch 'rc/configure-use-libs-when-checking-a...	blob \| commitdiff \| raw \| diff to current
2015-11-05	Junio C Hamano	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| commitdiff \| raw \| diff to current
2015-11-05	Junio C Hamano	Merge branch 'jc/add-u-A-default-to-top' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-04	Junio C Hamano	Merge branch 'xf/user-manual-ff' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-04	Junio C Hamano	Merge branch 'xf/user-manual-markup' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-03	Junio C Hamano	Merge branch 'jk/merge-file-exit-code' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-03	Junio C Hamano	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| commitdiff \| raw \| diff to current
2015-10-30	Junio C Hamano	Merge branch 'jk/merge-file-exit-code'	blob \| commitdiff \| raw \| diff to current
2015-10-30	Junio C Hamano	Merge branch 'xf/user-manual-ff'	blob \| commitdiff \| raw \| diff to current
2015-10-30	Junio C Hamano	Merge branch 'jc/add-u-A-default-to-top'	blob \| commitdiff \| raw \| diff to current
2015-10-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-10-29	Junio C Hamano	Merge branch 'xf/user-manual-markup'	blob \| commitdiff \| raw \| diff to current
2015-10-20	Junio C Hamano	Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...	blob \| commitdiff \| raw \| diff to current
2015-10-16	Junio C Hamano	Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...	blob \| commitdiff \| raw \| diff to current
2015-10-16	Junio C Hamano	Merge branch 'jk/asciidoctor-section-heading-markup...	blob \| commitdiff \| raw \| diff to current
2015-10-16	Junio C Hamano	Merge branch 'sb/http-flaky-test-fix' into maint	blob \| commitdiff \| raw \| diff to current
2015-10-16	Junio C Hamano	Merge branch 'jk/make-findstring-makeflags-fix' into...	blob \| commitdiff \| raw \| diff to current
2015-10-16	Junio C Hamano	Merge branch 'jw/make-arflags-customizable' into maint	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom