Merge branch 'cc/shared-index-permbits'
[gitweb.git] / git-mergetool--lib.sh
2018-11-21 Merge branch 'cc/shared-index-permbits'
2018-11-21 Merge branch 'nd/clone-case-smashing-warning'
2018-11-21 Merge branch 'cc/delta-islands'
2018-11-19 Merge branch 'nd/format-patch-cover-letter-stat-width'
2018-11-19 Merge branch 'ds/push-squelch-ambig-warning'
2018-11-18 Merge branch 'jk/close-duped-fd-before-unlock-for-bundle'
2018-11-18 Merge branch 'js/fuzz-cxxflags'
2018-11-18 Merge branch 'js/mingw-msdn-url'
2018-11-18 Merge branch 'cb/notes-freeing-always-null-fix'
2018-11-18 Merge branch 'js/apply-recount-allow-noop'
2018-11-18 Merge branch 'ra/rev-parse-exclude-glob'
2018-11-18 Merge branch 'js/rebase-autostash-detach-fix'
2018-11-18 Merge branch 'ab/range-diff-no-patch'
2018-11-18 Merge branch 'jk/verify-sig-merge-into-void'
2018-11-18 Merge branch 'mg/gpg-fingerprint-test'
2018-11-18 Merge branch 'nd/pthreads'
2018-11-18 Merge branch 'ds/reachable-topo-order'
2018-11-13 Merge branch 'nd/complete-format-patch'
2018-11-13 Merge branch 'nd/tree-walk-path-exclusion'
2018-11-13 Merge branch 'sg/travis-install-dependencies'
2018-11-13 Merge branch 'jk/xdiff-interface'
2018-11-13 Merge branch 'nd/per-worktree-ref-iteration'
2018-11-13 Merge branch 'bp/refresh-index-using-preload'
2018-11-13 Merge branch 'ag/rebase-i-in-c'
2018-11-13 Merge branch 'al/send-email-auto-cte-fixup'
2018-11-13 Merge branch 'pw/am-rebase-read-author-script'
2018-11-13 Merge branch 'jc/war-on-string-list'
2018-11-13 Merge branch 'ag/rev-parse-all-exclude-fix'
2018-11-13 Merge branch 'jt/tighten-fetch-proto-v2-response'
2018-11-13 Merge branch 'ao/submodule-wo-gitmodules-checked-out'
2018-11-13 Merge branch 'ma/sequencer-do-reset-saner-loop-termination'
2018-11-13 Merge branch 'js/mingw-utf8-env'
2018-11-13 Merge branch 'ab/pack-tests-cleanup'
2018-11-13 Merge branch 'ds/test-multi-pack-index'
2018-11-13 Merge branch 'nd/wildmatch-double-asterisk'
2018-11-13 Merge branch 'nd/per-worktree-config'
2018-11-13 Merge branch 'jk/stream-pack-non-delta-clarification'
2018-11-13 Merge branch 'jk/proto-v2-ref-prefix-fix'
2018-11-13 Merge branch 'jk/detect-truncated-zlib-input'
2018-11-13 Merge branch 'nd/config-split'
2018-11-06 Merge branch 'sg/test-verbose-log'
2018-11-06 Merge branch 'rj/header-cleanup'
2018-11-06 Merge branch 'ss/travis-ci-force-vm-mode'
2018-11-06 Merge branch 'sg/test-rebase-editor-fix'
2018-11-06 Merge branch 'tb/char-may-be-unsigned'
2018-11-06 Merge branch 'js/mingw-ns-filetime'
2018-11-06 Merge branch 'md/exclude-promisor-objects-fix'
2018-11-06 Merge branch 'jw/send-email-no-auth'
2018-11-06 Merge branch 'nd/submodule-unused-vars'
2018-11-06 Merge branch 'nd/unpack-trees-with-cache-tree'
2018-11-06 Merge branch 'nd/completion-negation'
2018-11-06 Merge branch 'jt/upload-pack-v2-fix-shallow'
2018-11-06 Merge branch 'sb/submodule-url-to-absolute'
2018-11-06 Merge branch 'js/shallow-and-fetch-prune'
2018-11-06 Merge branch 'js/remote-archive-dwimfix'
2018-11-02 Merge branch 'jc/http-curlver-warnings'
2018-11-02 Merge branch 'js/mingw-http-ssl'
2018-11-02 Merge branch 'mg/gpg-fingerprint'
2018-11-02 Merge branch 'mg/gpg-parse-tighten'
2018-11-02 Merge branch 'en/merge-cleanup-more'
2018-11-02 Merge branch 'js/rebase-i-shortopt'
2018-11-02 Merge branch 'js/rebase-i-break'
2018-11-02 Merge branch 'js/rebase-autostash-fix'
2018-11-02 Merge branch 'cb/printf-empty-format'
2018-11-02 Merge branch 'jc/rebase-in-c-5-test-typofix'
2018-11-02 Merge branch 'pk/rebase-in-c-6-final'
2018-11-02 Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i...
2018-11-02 Merge branch 'pk/rebase-in-c-5-test'
2018-11-02 Merge branch 'pk/rebase-in-c-4-opts'
2018-11-02 Merge branch 'pk/rebase-in-c-3-acts'
2018-11-02 Merge branch 'pk/rebase-in-c-2-basic'
2018-11-02 Merge branch 'ag/rebase-i-in-c'
2018-11-02 Merge branch 'pk/rebase-in-c'
2018-10-30 Merge branch 'jk/uploadpack-packobjectshook-fix'
2018-10-30 Merge branch 'uk/merge-subtree-doc-update'
2018-10-30 Merge branch 'cb/compat-mmap-is-private-read-only'
2018-10-30 Merge branch 'dl/mergetool-gui-option'
2018-10-25 mergetool: accept -g/--[no-]gui as arguments
2018-10-16 Merge branch 'jk/check-everything-connected-is-long...
2018-08-27 Merge branch 'sg/t7501-thinkofix'
2018-08-27 Merge branch 'sg/t0020-conversion-fix'
2018-08-27 Merge branch 'sg/t4051-fix'
2018-08-20 Merge branch 'js/typofixes'
2018-08-15 Merge branch 'sb/histogram-less-memory'
2018-05-30 Merge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-05-08 Merge branch 'ab/git-svn-get-record-typofix'
2018-04-25 Merge branch 'js/t5404-path-fix'
2018-04-25 Merge branch 'mn/send-email-credential-doc'
2018-04-25 Merge branch 'ak/bisect-doc-typofix'
2018-03-22 Merge branch 'sb/status-doc-fix' into maint
2018-03-22 Merge branch 'cl/t9001-cleanup' into maint
2018-03-22 Merge branch 'nd/diff-flush-before-warning' into maint
2018-03-21 Merge branch 'dp/merge-strategy-doc-fix'
2018-03-08 Merge branch 'mk/doc-pretty-fill'
2018-03-06 Merge branch 'cb/ttk-style' of git-gui into cb/git...
2018-03-02 Merge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02 Merge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-02-28 Merge branch 'tz/do-not-clean-spec-file'
2018-02-28 Merge branch 'sb/status-doc-fix'
2018-02-27 Merge branch 'bp/name-hash-dirname-fix'
next