]> git.ipfire.org Git - thirdparty/git.git/history - mergetools
t3401: add another directory rename testcase for rebase and am
[thirdparty/git.git] / mergetools /
2018-05-08  Junio C HamanoMerge branch 'so/glossary-ancestor'
2018-05-08  Junio C HamanoMerge branch 'ls/checkout-encoding'
2018-05-08  Junio C HamanoMerge branch 'ab/nuke-emacs-contrib'
2018-05-08  Junio C HamanoMerge branch 'nd/warn-more-for-devs'
2018-05-08  Junio C HamanoMerge branch 'sb/object-store-replace'
2018-05-08  Junio C HamanoMerge branch 'ds/commit-graph'
2018-05-08  Junio C HamanoMerge branch 'js/empty-config-section-fix'
2018-05-08  Junio C HamanoMerge branch 'ot/libify-get-ref-atom-value'
2018-05-08  Junio C HamanoMerge branch 'sb/submodule-move-nested'
2018-05-08  Junio C HamanoMerge branch 'dj/runtime-prefix'
2018-05-08  Junio C HamanoMerge branch 'ab/simplify-perl-makefile'
2018-05-08  Junio C HamanoMerge branch 'bw/protocol-v2'
2018-05-02  Junio C HamanoMerge branch 'bw/protocol-v2' into jt/partial-clone...
2018-04-25  Junio C HamanoMerge branch 'jm/mem-pool'
2018-04-25  Junio C HamanoMerge branch 'tg/use-git-contacts'
2018-04-25  Junio C HamanoMerge branch 'sb/filenames-with-dashes'
2018-04-25  Junio C HamanoMerge branch 'cc/perf-bisect'
2018-04-25  Junio C HamanoMerge branch 'bp/fsmonitor-prime-index'
2018-04-25  Junio C HamanoMerge branch 'bp/fsmonitor-bufsize-fix'
2018-04-25  Junio C HamanoMerge branch 'cb/bash-completion-ls-files-processing'
2018-04-25  Junio C HamanoMerge branch 'es/worktree-docs'
2018-04-25  Junio C HamanoMerge branch 'es/fread-reads-dir-autoconf-fix'
2018-04-25  Junio C HamanoMerge branch 'ps/test-chmtime-get'
2018-04-25  Junio C HamanoMerge branch 'js/t5404-path-fix'
2018-04-25  Junio C HamanoMerge branch 'jk/ref-array-push'
2018-04-25  Junio C HamanoMerge branch 'en/doc-typoes'
2018-04-25  Junio C HamanoMerge branch 'lw/daemon-log-destination'
2018-04-25  Junio C HamanoMerge branch 'mn/send-email-credential-doc'
2018-04-25  Junio C HamanoMerge branch 'ak/bisect-doc-typofix'
2018-04-25  Junio C HamanoMerge branch 'br/mergetools-guiffy'
2018-04-10  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion...
2018-04-05  Bill Ritchermergetools: add support for guiffy
2018-03-22  Junio C HamanoMerge branch 'gs/test-unset-xdg-cache-home' into maint
2018-03-22  Junio C HamanoMerge branch 'sb/status-doc-fix' into maint
2018-03-22  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix'...
2018-03-22  Junio C HamanoMerge branch 'jc/mailinfo-cleanup-fix' into maint
2018-03-22  Junio C HamanoMerge branch 'cl/t9001-cleanup' into maint
2018-03-22  Junio C HamanoMerge branch 'nd/diff-flush-before-warning' into maint
2018-03-21  Junio C HamanoMerge branch 'dp/merge-strategy-doc-fix'
2018-03-21  Junio C HamanoMerge branch 'ks/t3200-typofix'
2018-03-08  Junio C HamanoMerge branch 'mk/doc-pretty-fill'
2018-03-08  Junio C HamanoMerge branch 'ds/mark-parents-uninteresting-optim'
2018-03-06  Junio C HamanoMerge branch 'xz/send-email-batch-size'
2018-03-06  Junio C HamanoMerge branch 'cb/ttk-style' of git-gui into cb/git...
2018-03-02  Junio C HamanoMerge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02  Junio C HamanoMerge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-02-28  Junio C HamanoMerge branch 'tz/do-not-clean-spec-file'
2018-02-28  Junio C HamanoMerge branch 'gs/test-unset-xdg-cache-home'
2018-02-28  Junio C HamanoMerge branch 'sb/status-doc-fix'
2018-02-27  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion...
2018-02-27  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix'
2018-02-27  Junio C HamanoMerge branch 'bp/name-hash-dirname-fix'
2018-02-15  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix' into maint
2018-02-15  Junio C HamanoMerge branch 'sb/pull-rebase-submodule'
2018-02-13  Junio C HamanoMerge branch 'jc/mailinfo-cleanup-fix'
2018-02-13  Junio C HamanoMerge branch 'nd/diff-flush-before-warning'
2018-02-13  Junio C HamanoMerge branch 'cl/t9001-cleanup'
2018-01-23  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix'
2018-01-23  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion...
2018-01-09  Junio C HamanoMerge branch 'jk/doc-diff-options'
2018-01-09  Junio C HamanoMerge branch 'js/misc-git-gui-stuff' of ../git-gui
2018-01-05  Junio C HamanoMerge branch 'jh/memihash-opt'
2017-12-28  Junio C HamanoMerge branch 'sr/http-sslverify-config-doc'
2017-12-27  Junio C HamanoMerge branch 'es/clone-shared-worktree'
2017-12-27  Junio C HamanoMerge branch 'jk/cvsimport-quoting'
2017-12-27  Junio C HamanoMerge branch 'rs/strbuf-read-once-reset-length'
2017-12-27  Junio C HamanoMerge branch 'rs/fmt-merge-msg-string-leak-fix'
2017-12-27  Junio C HamanoMerge branch 'rs/am-builtin-leakfix'
2017-12-19  Junio C HamanoMerge branch 'sg/setup-doc-update'
2017-12-13  Junio C HamanoMerge branch 'ks/doc-checkout-previous'
2017-12-13  Junio C HamanoMerge branch 'jc/receive-pack-hook-doc'
2017-12-06  Junio C HamanoMerge branch 'sp/doc-info-attributes'
2017-12-06  Junio C HamanoMerge branch 'rd/doc-notes-prune-fix'
2017-12-06  Junio C HamanoMerge branch 'rd/man-reflog-add-n'
2017-12-06  Junio C HamanoMerge branch 'rd/man-prune-progress'
2017-12-06  Junio C HamanoMerge branch 'jc/merge-base-fork-point-doc' into maint
2017-12-06  Junio C HamanoMerge branch 'tz/notes-error-to-stderr' into maint
2017-12-06  Junio C HamanoMerge branch 'rs/apply-inaccurate-eof-with-incomplete...
2017-12-06  Junio C HamanoMerge branch 'tz/complete-branch-copy' into maint
2017-12-06  Junio C HamanoMerge branch 'sd/branch-copy' into maint
2017-12-05  Junio C HamanoMerge branch 'ls/no-double-utf8-author-name' of .....
2017-11-27  Junio C HamanoMerge branch 'tz/complete-branch-copy'
2017-11-27  Junio C HamanoMerge branch 'rs/apply-inaccurate-eof-with-incomplete...
2017-11-27  Junio C HamanoMerge branch 'sd/branch-copy'
2017-11-27  Junio C HamanoMerge branch 'tz/notes-error-to-stderr'
2017-11-27  Junio C HamanoMerge branch 'jc/merge-base-fork-point-doc'
2017-11-27  Junio C HamanoMerge branch 'rs/apply-fuzzy-match-fix' into maint
2017-11-27  Junio C HamanoMerge branch 'rs/imap-send-next-arg-fix' into maint
2017-11-22  Junio C HamanoMerge branch 'jn/reproducible-build' of ../git-gui...
2017-11-21  Junio C HamanoMerge branch 'rs/apply-fuzzy-match-fix'
2017-11-21  Junio C HamanoMerge branch 'cb/t4201-robustify' into maint
2017-11-21  Junio C HamanoMerge branch 'ad/rebase-i-serie-typofix' into maint
2017-11-21  Junio C HamanoMerge branch 'ab/pcre-v2' into maint
2017-11-15  Junio C HamanoMerge branch 'cb/t4201-robustify'
2017-11-15  Junio C HamanoMerge branch 'ab/pcre-v2'
2017-11-15  Junio C HamanoMerge branch 'ad/rebase-i-serie-typofix'
2017-11-15  Junio C HamanoMerge branch 'rs/imap-send-next-arg-fix'
2017-11-15  Junio C HamanoMerge branch 'dk/libsecret-unlock-to-load-fix' into...
2017-11-15  Junio C HamanoMerge branch 'js/early-config' into maint
2017-11-15  Junio C HamanoMerge branch 'jk/rebase-i-exec-gitdir-fix' into maint
next