]> git.ipfire.org Git - thirdparty/git.git/history - git-mergetool.sh
builtin/apply: move 'no_add' global into 'struct apply_state'
[thirdparty/git.git] / git-mergetool.sh
2016-05-10  Junio C HamanoMerge branch 'sk/gitweb-highlight-encoding'
2016-05-10  Junio C HamanoMerge branch 'sb/clean-test-fix'
2016-05-10  Junio C HamanoMerge branch 'rn/glossary-typofix'
2016-05-10  Junio C HamanoMerge branch 'ls/travis-submitting-patches'
2016-05-10  Junio C HamanoMerge branch 'js/close-packs-before-gc'
2016-05-10  Junio C HamanoMerge branch 'ew/normal-to-e'
2016-05-10  Junio C HamanoMerge branch 'ls/p4-lfs'
2016-05-10  Junio C HamanoMerge branch 'sb/misc-cleanups'
2016-05-10  Junio C HamanoMerge branch 'ew/doc-split-pack-disables-bitmap'
2016-05-06  Junio C HamanoSync with maint
2016-05-06  Junio C HamanoMerge branch 'sb/submodule-path-misc-bugs' into maint
2016-05-06  Junio C HamanoMerge branch 'ky/imap-send-openssl-1.1.0' into maint
2016-05-06  Junio C HamanoMerge branch 'js/replace-edit-use-editor-configuration...
2016-05-06  Junio C HamanoMerge branch 'cc/apply' into maint
2016-05-06  Junio C HamanoMerge branch 'kn/for-each-tag-branch' into maint
2016-05-06  Junio C HamanoMerge branch 'jk/diff-compact-heuristic'
2016-05-06  Junio C HamanoMerge branch 'ls/p4-lfs-test-fix-2.7.0'
2016-05-06  Junio C HamanoMerge branch 'bc/object-id'
2016-05-06  Junio C HamanoMerge branch 'bw/rebase-merge-entire-branch'
2016-05-06  Junio C HamanoMerge branch 'jc/drop-git-spec-in'
2016-05-06  Junio C HamanoMerge branch 'js/http-custom-headers'
2016-05-06  Junio C HamanoMerge branch 'sb/clone-shallow-passthru'
2016-05-06  Junio C HamanoMerge branch 'ld/p4-test-py3'
2016-05-06  Junio C HamanoMerge branch 'sb/config-exit-status-list'
2016-05-03  Junio C HamanoSync with maint
2016-05-03  Junio C HamanoMerge branch 'nf/mergetool-prompt'
2016-05-03  Junio C HamanoMerge branch 'jd/send-email-to-whom'
2016-05-03  Junio C HamanoMerge branch 'jk/fix-attribute-macro-in-2.5'
2016-05-03  Junio C HamanoMerge branch 'js/name-rev-use-oldest-ref'
2016-05-02  Junio C HamanoMerge branch 'jk/use-write-script-more' into maint
2016-05-02  Junio C HamanoMerge branch 'jc/xstrfmt-null-with-prec-0' into maint
2016-05-02  Junio C HamanoMerge branch 'ew/send-email-drop-data-dumper' into...
2016-05-02  Junio C HamanoMerge branch 'ad/cygwin-wants-rename' into maint
2016-05-02  Junio C HamanoMerge branch 'jk/do-not-printf-NULL' into maint
2016-05-02  Junio C HamanoMerge branch 'jc/http-socks5h' into maint
2016-05-02  Junio C HamanoMerge branch 'ky/imap-send' into maint
2016-05-02  Junio C HamanoMerge branch 'ad/commit-have-m-option' into maint
2016-05-02  Junio C HamanoMerge branch 'sb/submodule-helper-clone-regression...
2016-05-02  Junio C HamanoMerge branch 'jk/branch-shortening-funny-symrefs' into...
2016-05-02  Junio C HamanoMerge branch 'es/format-patch-doc-hide-no-patch' into...
2016-05-02  Junio C HamanoMerge branch 'ky/branch-m-worktree' into maint
2016-05-02  Junio C HamanoMerge branch 'ky/branch-d-worktree' into maint
2016-05-02  Junio C HamanoMerge branch 'jk/check-repository-format' into maint
2016-05-02  Junio C HamanoMerge branch 'ew/send-email-readable-message-id' into...
2016-04-29  Junio C HamanoMerge branch 'js/mingw-tests-2.8' into maint
2016-04-29  Junio C HamanoMerge branch 'ep/trace-doc-sample-fix' into maint
2016-04-29  Junio C HamanoMerge branch 'jc/makefile-redirection-stderr' into...
2016-04-29  Junio C HamanoMerge branch 'ak/use-hashmap-iter-first-in-submodule...
2016-04-29  Junio C HamanoMerge branch 'tb/blame-force-read-cache-to-workaround...
2016-04-29  Junio C HamanoMerge branch 'sk/send-pack-all-fix' into maint
2016-04-29  Junio C HamanoMerge branch 'sg/diff-multiple-identical-renames' into...
2016-04-29  Junio C HamanoMerge branch 'ss/msvc' into maint
2016-04-29  Junio C HamanoMerge branch 'st/verify-tag'
2016-04-29  Junio C HamanoMerge branch 'jc/merge-refuse-new-root'
2016-04-29  Junio C HamanoMerge branch 'jk/push-client-deadlock-fix'
2016-04-29  Junio C HamanoMerge branch 'js/replace-edit-use-editor-configuration'
2016-04-29  Junio C HamanoMerge branch 'sb/mv-submodule-fix'
2016-04-29  Junio C HamanoMerge branch 'da/user-useconfigonly'
2016-04-25  Junio C HamanoMerge branch 'sb/submodule-path-misc-bugs'
2016-04-25  Junio C HamanoMerge branch 'dt/pre-refs-backend'
2016-04-25  Junio C HamanoMerge branch 'jc/rerere-multi'
2016-04-25  Nikola Forródifftool/mergetool: make the form of yes/no questions...
2016-04-25  Junio C HamanoMerge tag 'l10n-2.8.0-rnd3-fr' of git://github.com...
2016-04-22  Junio C HamanoMerge branch 'ad/cygwin-wants-rename'
2016-04-22  Junio C HamanoMerge branch 'jk/use-write-script-more'
2016-04-22  Junio C HamanoMerge branch 'jk/do-not-printf-NULL'
2016-04-22  Junio C HamanoMerge branch 'jc/http-socks5h'
2016-04-22  Junio C HamanoMerge branch 'ky/imap-send-openssl-1.1.0'
2016-04-22  Junio C HamanoMerge branch 'ky/imap-send'
2016-04-22  Junio C HamanoMerge branch 'jc/xstrfmt-null-with-prec-0'
2016-04-22  Junio C HamanoMerge branch 'ad/commit-have-m-option'
2016-04-22  Junio C HamanoMerge branch 'ew/send-email-drop-data-dumper'
2016-04-22  Junio C HamanoMerge branch 'ew/send-email-readable-message-id'
2016-04-22  Junio C HamanoMerge branch 'sb/submodule-helper-clone-regression...
2016-04-18  Junio C HamanoMerge branch 'jk/branch-shortening-funny-symrefs'
2016-04-18  Junio C HamanoMerge branch 'ky/branch-m-worktree'
2016-04-15  Junio C HamanoMerge branch 'jv/merge-nothing-into-void' into maint
2016-04-15  Junio C HamanoMerge branch 'ss/commit-squash-msg' into maint
2016-04-15  Junio C HamanoMerge branch 'jk/send-email-rtrim-mailrc-alias' into...
2016-04-15  Junio C HamanoMerge branch 'da/mergetool-delete-delete-conflict'...
2016-04-15  Junio C HamanoMerge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...
2016-04-15  Junio C HamanoMerge branch 'pb/t7502-drop-dup' into maint
2016-04-15  Junio C HamanoMerge branch 'ss/exc-flag-is-a-collection-of-bits'...
2016-04-13  Junio C HamanoMerge branch 'tb/blame-force-read-cache-to-workaround...
2016-04-13  Junio C HamanoMerge branch 'mg/complete-cherry-mark-to-log'
2016-04-13  Junio C HamanoMerge branch 'ep/trace-doc-sample-fix'
2016-04-13  Junio C HamanoMerge branch 'jc/makefile-redirection-stderr'
2016-04-13  Junio C HamanoMerge branch 'lt/pretty-expand-tabs'
2016-04-13  Junio C HamanoMerge branch 'mj/pull-rebase-autostash'
2016-04-13  Junio C HamanoMerge branch 'jn/mergetools-examdiff'
2016-04-13  Junio C HamanoMerge branch 'es/format-patch-doc-hide-no-patch'
2016-04-13  Junio C HamanoMerge branch 'js/mingw-tests-2.8'
2016-04-13  Junio C HamanoMerge branch 'cc/apply'
2016-04-13  Junio C HamanoMerge branch 'sb/misc-cleanups'
2016-04-13  Junio C HamanoMerge branch 'sk/send-pack-all-fix'
2016-04-13  Junio C HamanoMerge branch 'sg/diff-multiple-identical-renames'
2016-04-13  Junio C HamanoMerge branch 'kn/for-each-tag-branch'
2016-04-13  Junio C HamanoMerge branch 'ky/branch-d-worktree'
2016-04-13  Junio C HamanoMerge branch 'rz/worktree-no-checkout'
2016-04-13  Junio C HamanoMerge branch 'rt/rebase-i-shorten-stop-report'
next