git.oblomov.eu Git - git/history - git-mergetool--lib.sh

2016-04-18	Junio C Hamano	Merge branch 'ky/branch-m-worktree'	blob \| commitdiff \| raw
2016-04-15	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2016-04-15	Junio C Hamano	Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'pb/t7502-drop-dup' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'ss/exc-flag-is-a-collection-of-bits'...	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'tb/blame-force-read-cache-to-workaround...	blob \| commitdiff \| raw
2016-04-13	Junio C Hamano	Merge branch 'mg/complete-cherry-mark-to-log'	blob \| commitdiff \| raw
2016-04-13	Junio C Hamano	Merge branch 'ep/trace-doc-sample-fix'	blob \| commitdiff \| raw
2016-04-13	Junio C Hamano	Merge branch 'jc/makefile-redirection-stderr'	blob \| commitdiff \| raw
2016-04-13	Junio C Hamano	Merge branch 'lt/pretty-expand-tabs'	blob \| commitdiff \| raw
2016-04-13	Junio C Hamano	Merge branch 'mj/pull-rebase-autostash'	blob \| commitdiff \| raw
2016-04-13	Junio C Hamano	Merge branch 'jn/mergetools-examdiff'	blob \| commitdiff \| raw
2016-04-13	Junio C Hamano	Merge branch 'es/format-patch-doc-hide-no-patch'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'sk/send-pack-all-fix'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'sg/diff-multiple-identical-renames'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'kn/for-each-tag-branch'	blob \| commitdiff \| raw \| diff to current
2016-04-06	Junio C Hamano	Merge branch 'pb/t7502-drop-dup'	blob \| commitdiff \| raw \| diff to current
2016-04-06	Junio C Hamano	Merge branch 'ss/exc-flag-is-a-collection-of-bits'	blob \| commitdiff \| raw \| diff to current
2016-04-04	Jacob Nisnevich	mergetools: create mergetool_find_win32_cmd() helper...	blob \| commitdiff \| raw
2016-04-03	Junio C Hamano	Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'	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 'mm/doc-hooks-linkgit-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-03-21	Junio C Hamano	Merge branch 'es/st-add4-gcc-4.2-workaround' into maint	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-17	Junio C Hamano	Merge branch 'maint-2.4' into maint-2.5	blob \| commitdiff \| raw \| diff to current
2016-03-16	Junio C Hamano	Merge branch 'jk/path-name-safety-2.4' into jk/path...	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-10	Junio C Hamano	Merge branch 'ma/update-hooks-sample-typofix' into...	blob \| commitdiff \| raw \| diff to current
2016-03-10	Junio C Hamano	Merge branch 'ak/extract-argv0-last-dir-sep' into maint	blob \| commitdiff \| raw \| diff to current
2016-03-10	Junio C Hamano	Merge branch 'jk/pack-idx-corruption-safety' into maint	blob \| commitdiff \| raw \| diff to current
2016-03-10	Junio C Hamano	Merge branch 'jk/grep-binary-workaround-in-test' into...	blob \| commitdiff \| raw \| diff to current
2016-03-10	Junio C Hamano	Merge branch 'mm/push-simple-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-03-10	Junio C Hamano	Merge branch 'jk/more-comments-on-textconv' into maint	blob \| commitdiff \| raw \| diff to current
2016-03-10	Junio C Hamano	Merge branch 'jk/no-diff-emit-common' into maint	blob \| commitdiff \| raw \| diff to current
2016-03-10	Junio C Hamano	Merge branch 'nd/dwim-wildcards-as-pathspecs' into...	blob \| commitdiff \| raw \| diff to current
2016-03-04	Junio C Hamano	Merge branch 'jk/pack-idx-corruption-safety'	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-26	Junio C Hamano	Merge branch 'ma/update-hooks-sample-typofix'	blob \| commitdiff \| raw \| diff to current
2016-02-26	Junio C Hamano	Merge branch 'jk/grep-binary-workaround-in-test'	blob \| commitdiff \| raw \| diff to current
2016-02-26	Junio C Hamano	Merge branch 'mm/push-simple-doc'	blob \| commitdiff \| raw \| diff to current
2016-02-26	Junio C Hamano	Merge branch 'jk/more-comments-on-textconv'	blob \| commitdiff \| raw \| diff to current
2016-02-26	Junio C Hamano	Merge branch 'jk/no-diff-emit-common'	blob \| commitdiff \| raw \| diff to current
2016-02-26	Junio C Hamano	Merge branch 'ak/extract-argv0-last-dir-sep'	blob \| commitdiff \| raw \| diff to current
2016-02-24	Junio C Hamano	Merge branch 'nd/dwim-wildcards-as-pathspecs'	blob \| commitdiff \| raw \| diff to current
2016-02-22	Junio C Hamano	Merge branch 'js/git-remote-add-url-insteadof-test'	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-22	Junio C Hamano	Merge branch 'nd/ita-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-17	Junio C Hamano	Merge branch 'jk/rerere-xsnprintf'	blob \| commitdiff \| raw \| diff to current
2016-02-10	Junio C Hamano	Merge branch 'wp/sha1-name-negative-match'	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 'sg/t6050-failing-editor-test-fix' into...	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 'jk/sanity' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'ho/gitweb-squelch-undef-warning' into...	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'nd/exclusion-regression-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'ew/send-email-mutt-alias-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'nd/dir-exclude-cleanup' 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-29	Junio C Hamano	Merge branch 'jk/sanity'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'tg/grep-no-index-fallback'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'ho/gitweb-squelch-undef-warning'	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 'nd/exclusion-regression-fix'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'sg/t6050-failing-editor-test-fix'	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 'ew/send-email-mutt-alias-fix'	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 'nd/ita-cleanup'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'nd/dir-exclude-cleanup'	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
2016-01-04	Junio C Hamano	Merge branch 'jk/pending-keep-tag-name' into maint	blob \| commitdiff \| raw \| diff to current
2016-01-04	Junio C Hamano	Merge branch 'jk/symbolic-ref-maint' into maint	blob \| commitdiff \| raw \| diff to current
2016-01-04	Junio C Hamano	Merge branch 'sg/completion-no-column' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-28	Junio C Hamano	Merge branch 'jk/pending-keep-tag-name'	blob \| commitdiff \| raw \| diff to current
2015-12-28	Junio C Hamano	Merge branch 'jk/symbolic-ref-maint'	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 branch 'sg/completion-no-column'	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-15	Junio C Hamano	Merge branch 'ls/p4-keep-empty-commits' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-15	Junio C Hamano	Merge branch 'jk/prune-mtime' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-15	Junio C Hamano	Merge branch 'ls/p4-keep-empty-commits'	blob \| commitdiff \| raw \| diff to current
2015-12-15	Junio C Hamano	Merge branch 'jk/prune-mtime'	blob \| commitdiff \| raw \| diff to current
2015-12-11	Junio C Hamano	Merge branch 'cb/t3404-shellquote' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-11	Junio C Hamano	Merge branch 'rs/show-branch-argv-array' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-11	Junio C Hamano	Merge branch 'cb/t3404-shellquote'	blob \| commitdiff \| raw \| diff to current
2015-12-08	Junio C Hamano	Merge branch 'ad/sha1-update-chunked' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-08	Junio C Hamano	Merge branch 'jk/rebase-no-autostash' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-04	Junio C Hamano	Merge branch 'da/difftool' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-04	Junio C Hamano	Merge branch 'ad/sha1-update-chunked'	blob \| commitdiff \| raw \| diff to current
2015-12-01	Jeff King	Merge branch 'pt/http-socks-proxy' into maint	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 'rs/daemon-plug-child-leak' into maint	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 'js/misc-fixes' into maint	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-05	Junio C Hamano	Merge branch 'jk/delete-modechange-conflict' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-05	Junio C Hamano	Merge branch 'js/imap-send-curl-compilation-fix' into...	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom