git.oblomov.eu Git - git/history - mergetools/diffmerge

2017-01-17	Junio C Hamano	Merge branch 'ls/t0021-fixup' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'ak/lazy-prereq-mktemp' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'nd/qsort-in-merge-recursive' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'dt/smart-http-detect-server-going-away...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'mk/mingw-winansi-ttyname-termination...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'gv/p4-multi-path-commit-fix' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/difftool-in-subdir' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'ld/p4-compare-dir-vs-symlink' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jc/push-default-explicit' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jt/mailinfo-fold-in-body-headers' into...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/index-pack-wo-repo-from-stdin' into...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/parseopt-usage-msg-opt' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/quote-env-path-list-component' into...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'nd/shallow-fixup' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'sb/sequencer-abort-safety' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'da/mergetool-xxdiff-hotkey' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jc/pull-rebase-ff' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'js/normalize-path-copy-ceil' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'ak/commit-only-allow-empty' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'da/difftool-dir-diff-fix' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jb/diff-no-index-no-abbrev' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/stash-disable-renames-internally'...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/http-walker-limit-redirect' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jc/renormalize-merge-kill-safer-crlf...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'ls/p4-empty-file-on-lfs' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'da/mergetool-trust-exit-code' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'bb/unicode-9.0' into maint	blob \| commitdiff \| raw \| diff to current
2016-11-29	David Aguilar	mergetool: honor mergetool.$tool.trustExitCode for...	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 \| 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-07-06	Junio C Hamano	Merge branch 'ap/git-svn-propset-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'ap/git-svn-propset-doc'	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-30	Junio C Hamano	Merge branch 'rj/log-decorate-auto'	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 '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 '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 'ss/clone-depth-single-doc'	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 'ss/user-manual'	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
2015-12-28	Junio C Hamano	Merge branch 'jk/pending-keep-tag-name'	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-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 'jk/prune-mtime'	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 '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 '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 'sa/send-email-smtp-batch-data-limit'...	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-04	Junio C Hamano	Merge branch 'jc/everyday-markup' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-04	Junio C Hamano	Merge branch 'jc/em-dash-in-doc' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-04	Junio C Hamano	Merge branch 'es/worktree-add' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-03	Junio C Hamano	Merge branch 'mk/blame-error-message' 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 'dt/name-hash-dir-entry-fix' 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-11-03	Junio C Hamano	Merge branch 'da/difftool'	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
next

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

RSS Atom