Andrew's git - gitweb.git/history - git-mergetool--lib.sh

[gitweb.git] / git-mergetool--lib.sh

2016-12-19	Merge branch 'kh/tutorial-grammofix'	blob \| diff \| raw
2016-12-19	Merge branch 'da/mergetool-xxdiff-hotkey'	blob \| diff \| raw
2016-12-19	Merge branch 'lr/doc-fix-cet'	blob \| diff \| raw
2016-12-19	Merge branch 'sb/t3600-cleanup'	blob \| diff \| raw
2016-12-19	Merge branch 'jc/pull-rebase-ff'	blob \| diff \| raw
2016-12-19	Merge branch 'ld/p4-worktree'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/make-tags-find-sources-tweak'	blob \| diff \| raw
2016-12-19	Merge branch 'js/normalize-path-copy-ceil'	blob \| diff \| raw
2016-12-19	Merge branch 'bb/unicode-9.0'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/readme-gmane-is-no-more'	blob \| diff \| raw
2016-12-19	Merge branch 'jc/lock-report-on-error'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/xdiff-drop-xdl-fast-hash'	blob \| diff \| raw
2016-12-19	Merge branch 'nd/rebase-forget'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/trailers-placeholder-in-pretty'	blob \| diff \| raw
2016-12-19	Merge branch 'ak/commit-only-allow-empty'	blob \| diff \| raw
2016-12-19	Merge branch 'da/difftool-dir-diff-fix'	blob \| diff \| raw
2016-12-19	Merge branch 'jb/diff-no-index-no-abbrev'	blob \| diff \| raw
2016-12-19	Merge branch 'rj/git-version-gen-do-not-force-abbrev'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/stash-disable-renames-internally'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/http-walker-limit-redirect'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/http-walker-limit-redirect-2.9'	blob \| diff \| raw
2016-12-19	Merge branch 'nd/for-each-ref-ignore-case'	blob \| diff \| raw
2016-12-19	Merge branch 'sb/unpack-trees-grammofix'	blob \| diff \| raw
2016-12-19	Merge branch 'ls/travis-update-p4-and-lfs'	blob \| diff \| raw
2016-12-19	Merge branch 'ls/t0021-fixup'	blob \| diff \| raw
2016-12-19	Merge branch 'ah/grammos'	blob \| diff \| raw
2016-12-19	Merge branch 'jc/renormalize-merge-kill-safer-crlf'	blob \| diff \| raw
2016-12-19	Merge branch 'jt/use-trailer-api-in-commands'	blob \| diff \| raw
2016-12-16	Merge branch 'ls/p4-retry-thrice'	blob \| diff \| raw
2016-12-16	Merge branch 'ls/p4-empty-file-on-lfs'	blob \| diff \| raw
2016-12-16	Merge branch 'ld/p4-update-shelve'	blob \| diff \| raw
2016-12-16	Merge branch 'vk/p4-submit-shelve'	blob \| diff \| raw
2016-12-16	Merge branch 'da/mergetool-trust-exit-code'	blob \| diff \| raw
2016-11-29	Merge branch 'tk/diffcore-delta-remove-unused' into...	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'nd/worktree-lock' into maint	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'ps/common-info-doc' into maint	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'nd/test-helpers' into maint	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into...	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'rs/commit-pptr-simplify' into maint	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'jk/rebase-config-insn-fmt-docfix' into...	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'jk/daemon-path-ok-check-truncation' into...	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'mm/send-email-cc-cruft-after-address...	blob \| diff \| raw \| diff to current
2016-11-29	mergetool: honor mergetool.$tool.trustExitCode for...	blob \| diff \| raw
2016-11-23	Merge branch 'js/rebase-i-commentchar-fix'	blob \| diff \| raw \| diff to current
2016-11-23	Merge branch 'jc/for-each-ref-head-segfault-fix'	blob \| diff \| raw \| diff to current
2016-11-17	Merge branch 'tk/diffcore-delta-remove-unused'	blob \| diff \| raw \| diff to current
2016-11-17	Merge branch 'nd/worktree-lock'	blob \| diff \| raw \| diff to current
2016-11-11	Merge branch 'ps/common-info-doc'	blob \| diff \| raw \| diff to current
2016-10-31	Merge branch 'nd/test-helpers'	blob \| diff \| raw \| diff to current
2016-10-31	Merge branch 'sc/fmt-merge-msg-doc-markup-fix'	blob \| diff \| raw \| diff to current
2016-10-31	Merge branch 'rs/commit-pptr-simplify'	blob \| diff \| raw \| diff to current
2016-10-31	Merge branch 'jk/rebase-config-insn-fmt-docfix'	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'rs/pretty-format-color-doc-fix' into...	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'js/reset-usage' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'po/fix-doc-merge-base-illustration' into...	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'jk/tap-verbose-fix' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'jk/tighten-alloc' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'jk/merge-base-fork-point-without-reflog...	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'sb/submodule-config-doc-drop-path' into...	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'nd/commit-p-doc' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'jk/clone-copy-alternates-fix' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'ak/curl-imap-send-explicit-scheme' into...	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'js/regexec-buf' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'rs/c-auto-resets-attributes' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'yk/git-tag-remove-mention-of-old-layout...	blob \| diff \| raw \| diff to current
2016-10-27	Merge branch 'jk/daemon-path-ok-check-truncation'	blob \| diff \| raw \| diff to current
2016-10-27	Merge branch 'sb/submodule-ignore-trailing-slash'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'po/fix-doc-merge-base-illustration'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'jk/tap-verbose-fix'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'mm/send-email-cc-cruft-after-address'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'yk/git-tag-remove-mention-of-old-layout...	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'jk/tighten-alloc'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'jk/merge-base-fork-point-without-reflog'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'mm/credential-libsecret'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'jc/ws-error-highlight'	blob \| diff \| raw \| diff to current
2016-10-20	Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'sb/submodule-config-doc-drop-path'	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'rs/pretty-format-color-doc-fix'	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'js/reset-usage'	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'js/regexec-buf'	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'nd/commit-p-doc'	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'jk/clone-copy-alternates-fix'	blob \| diff \| raw \| diff to current
2016-10-11	Merge branch 'jk/verify-packfile-gently' into maint	blob \| diff \| raw \| diff to current
2016-10-11	Merge branch 'jc/verify-loose-object-header' into maint	blob \| diff \| raw \| diff to current
2016-10-11	Merge branch 'rs/git-gui-use-modern-git-merge-syntax...	blob \| diff \| raw \| diff to current
2016-10-11	Merge branch 'pb/rev-list-reverse-with-count' into...	blob \| diff \| raw \| diff to current
2016-10-11	Merge branch 'jk/graph-padding-fix' into maint	blob \| diff \| raw \| diff to current
2016-10-10	Merge branch 'jc/blame-reverse'	blob \| diff \| raw \| diff to current
2016-10-10	Merge branch 'nd/shallow-deepen'	blob \| diff \| raw \| diff to current
2016-10-10	Merge branch 'ak/curl-imap-send-explicit-scheme'	blob \| diff \| raw \| diff to current
2016-10-06	Merge branch 'rs/c-auto-resets-attributes'	blob \| diff \| raw \| diff to current
2016-10-06	Merge branch 'jk/graph-padding-fix'	blob \| diff \| raw \| diff to current
2016-10-03	Merge branch 'pb/rev-list-reverse-with-count'	blob \| diff \| raw \| diff to current
2016-10-03	Merge branch 'rs/git-gui-use-modern-git-merge-syntax'	blob \| diff \| raw \| diff to current
2016-10-03	Merge branch 'jc/verify-loose-object-header'	blob \| diff \| raw \| diff to current
2016-10-03	Merge branch 'nd/init-core-worktree-in-multi-worktree...	blob \| diff \| raw \| diff to current
2016-10-03	Merge branch 'jk/ident-ai-canonname-could-be-null'...	blob \| diff \| raw \| diff to current
2016-10-03	Merge branch 'jk/doc-cvs-update' into maint	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'jk/ident-ai-canonname-could-be-null'	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'jk/verify-packfile-gently'	blob \| diff \| raw \| diff to current
next