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

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

2019-05-08	Merge branch 'dr/ref-filter-push-track-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'ss/msvc-path-utils-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'jt/clone-server-option'	blob \| diff \| raw
2019-05-08	Merge branch 'tb/unexpected'	blob \| diff \| raw
2019-05-08	Merge branch 'nd/sha1-name-c-wo-the-repository'	blob \| diff \| raw
2019-05-08	Merge branch 'cc/replace-graft-peel-tags'	blob \| diff \| raw
2019-05-08	Merge branch 'js/trace2-to-directory'	blob \| diff \| raw
2019-05-08	Merge branch 'dl/merge-cleanup-scissors-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'jk/pack-objects-reports-num-objects-to...	blob \| diff \| raw
2019-05-08	Merge branch 'tz/git-svn-doc-markup-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'km/empty-repo-is-still-a-repo'	blob \| diff \| raw
2019-05-08	Merge branch 'dl/warn-tagging-a-tag'	blob \| diff \| raw
2019-05-08	Merge branch 'en/merge-directory-renames'	blob \| diff \| raw
2019-04-25	Merge branch 'js/macos-gettext-build'	blob \| diff \| raw
2019-04-25	Merge branch 'bs/sendemail-tighten-anything-by'	blob \| diff \| raw
2019-04-25	Merge branch 'bc/send-email-qp-cr'	blob \| diff \| raw
2019-04-25	Merge branch 'nd/submodule-foreach-quiet'	blob \| diff \| raw
2019-04-25	Merge branch 'js/iso8895-test-on-apfs'	blob \| diff \| raw
2019-04-25	Merge branch 'jc/gettext-test-fix'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/fetch-reachability-error-fix'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/xmalloc'	blob \| diff \| raw
2019-04-25	Merge branch 'km/t3000-retitle'	blob \| diff \| raw
2019-04-25	Merge branch 'js/untracked-cache-allocfix'	blob \| diff \| raw
2019-04-25	Merge branch 'js/t3301-unbreak-notes-test'	blob \| diff \| raw
2019-04-25	Merge branch 'tz/doc-apostrophe-no-longer-needed'	blob \| diff \| raw
2019-04-25	Merge branch 'sg/blame-in-bare-start-at-head'	blob \| diff \| raw
2019-04-25	Merge branch 'tg/ls-files-debug-format-fix'	blob \| diff \| raw
2019-04-25	Merge branch 'po/describe-not-necessarily-7'	blob \| diff \| raw
2019-04-25	Merge branch 'po/rerere-doc-fmt'	blob \| diff \| raw
2019-04-25	Merge branch 'sg/overlong-progress-fix'	blob \| diff \| raw
2019-04-25	Merge branch 'jt/batch-fetch-blobs-in-diff'	blob \| diff \| raw
2019-04-25	Merge branch 'ab/gc-docs'	blob \| diff \| raw
2019-04-25	Merge branch 'dl/submodule-set-branch'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/revision-rewritten-parents-in-prio...	blob \| diff \| raw
2019-04-25	Merge branch 'dk/blame-keep-origin-blob'	blob \| diff \| raw
2019-04-25	Merge branch 'bc/hash-transition-16'	blob \| diff \| raw
2019-04-25	Merge branch 'en/fast-import-parsing-fix'	blob \| diff \| raw
2019-04-25	Merge branch 'jt/fetch-no-update-shallow-in-proto-v2'	blob \| diff \| raw
2019-04-25	Merge branch 'jt/fetch-pack-wanted-refs-optim'	blob \| diff \| raw
2019-04-25	Merge branch 'ab/test-lib-pass-trace2-env'	blob \| diff \| raw
2019-04-25	Merge branch 'sg/index-pack-progress'	blob \| diff \| raw
2019-04-25	Merge branch 'ab/commit-graph-fixes'	blob \| diff \| raw
2019-04-25	Merge branch 'ab/gc-reflog'	blob \| diff \| raw
2019-04-25	Merge branch 'nd/checkout-m'	blob \| diff \| raw
2019-04-25	Merge branch 'js/difftool-no-index'	blob \| diff \| raw
2019-04-25	Merge branch 'pw/cherry-pick-continue'	blob \| diff \| raw
2019-04-25	Merge branch 'nd/commit-a-with-paths-msg-update'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/server-info-rabbit-hole'	blob \| diff \| raw
2019-04-25	Merge branch 'nd/diff-parseopt-4'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/unused-params-even-more'	blob \| diff \| raw
2019-04-25	Merge branch 'sg/test-atexit'	blob \| diff \| raw
2019-04-25	Merge branch 'ag/sequencer-reduce-rewriting-todo'	blob \| diff \| raw
2019-04-25	Merge branch 'bp/post-index-change-hook'	blob \| diff \| raw
2019-04-22	Merge branch 'da/smerge'	blob \| diff \| raw
2019-04-16	Merge branch 'js/remote-curl-i18n'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'js/anonymize-remote-curl-diag'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'jh/resize-convert-scratch-buffer'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'ja/dir-rename-doc-markup-fix'	blob \| diff \| raw \| diff to current
2019-04-04	mergetools: add support for smerge (Sublime Merge)	blob \| diff \| raw
2019-03-20	Merge branch 'jk/virtual-objects-do-exist'	blob \| diff \| raw \| diff to current
2019-03-18	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2019-03-11	Merge branch 'js/rebase-recreate-merge'	blob \| diff \| raw \| diff to current
2019-03-07	Merge branch 'ab/receive-pack-use-after-free-fix'	blob \| diff \| raw \| diff to current
2019-03-07	Merge branch 'nd/split-index-null-base-fix'	blob \| diff \| raw \| diff to current
2019-03-07	Merge branch 'rj/prune-packed-excess-args'	blob \| diff \| raw \| diff to current
2019-03-07	Merge branch 'du/branch-show-current'	blob \| diff \| raw \| diff to current
2019-02-14	Merge branch 'jc/no-grepping-for-strerror-in-tests'	blob \| diff \| raw \| diff to current
2019-02-14	Merge branch 'kd/t0028-octal-del-is-377-not-777'	blob \| diff \| raw \| diff to current
2019-02-14	Merge branch 'rj/sequencer-sign-off-header-static'	blob \| diff \| raw \| diff to current
2019-02-09	Merge branch 'tz/gpg-test-fix'	blob \| diff \| raw \| diff to current
2019-02-07	Merge branch 'jk/add-ignore-errors-bit-assignment-fix'	blob \| diff \| raw \| diff to current
2019-02-07	Merge branch 'ma/doc-diff-usage-fix'	blob \| diff \| raw \| diff to current
2019-02-07	Merge branch 'ab/diff-tree-doc-fix'	blob \| diff \| raw \| diff to current
2019-02-07	Merge branch 'ss/describe-dirty-in-the-right-directory'	blob \| diff \| raw \| diff to current
2019-02-07	Merge branch 'lt/date-human'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'sg/object-as-type-commit-graph-fix'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'bp/checkout-new-branch-optim'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'jk/attr-macro-fix'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'jk/add-ignore-errors-bit-assignment-fix'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'cc/test-ref-store-typofix'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'sg/obstack-cast-function-type-fix'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'jt/get-reference-with-commit-graph'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'sb/more-repo-in-api'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'js/add-e-clear-patch-before-stating'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'jk/remote-insteadof-cleanup'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'bc/sha-256'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'jt/fetch-pack-v2'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'jk/proto-v2-hidden-refs-fix'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'jk/save-getenv-result'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'cc/fetch-error-message-fix'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'cc/partial-clone-doc-typofix'	blob \| diff \| raw \| diff to current
2019-01-18	Merge branch 'js/gc-repack-close-before-remove'	blob \| diff \| raw \| diff to current
2019-01-18	Merge branch 'en/show-ref-doc-fix'	blob \| diff \| raw \| diff to current
2019-01-18	Merge branch 'jk/dev-build-format-security'	blob \| diff \| raw \| diff to current
2019-01-18	Merge branch 'es/doc-worktree-guessremote-config'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'tb/use-common-win32-pathfuncs-on-cygwin'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'km/rebase-doc-typofix'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'md/exclude-promisor-objects-fix-cleanup'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'hn/highlight-sideband-keywords'	blob \| diff \| raw \| diff to current
next