userdiff: add a builtin pattern for dts files
[gitweb.git] / t / t6020-merge-df.sh
2018-08-20 Merge branch 'ab/submodule-relative-url-tests'
2018-08-20 Merge branch 'en/incl-forward-decl'
2018-08-20 Merge branch 'jt/repack-promisor-packs'
2018-08-20 Merge branch 'wc/make-funnynames-shared-lazy-prereq'
2018-08-20 Merge branch 'jh/partial-clone-doc'
2018-08-20 Merge branch 'js/chain-lint-attrfix'
2018-08-20 Merge branch 'sb/pull-rebase-submodule'
2018-08-20 Merge branch 'js/range-diff'
2018-08-20 Merge branch 'nd/no-the-index'
2018-08-20 Merge branch 'es/chain-lint-more'
2018-08-20 Merge branch 'sg/t5310-empty-input-fix'
2018-08-20 Merge branch 'js/mingw-o-append'
2018-08-20 Merge branch 'jk/for-each-object-iteration'
2018-08-20 Merge branch 'ab/fetch-tags-noclobber'
2018-08-20 Merge branch 'ng/mergetool-lose-final-prompt'
2018-08-20 Merge branch 'jt/commit-graph-per-object-store'
2018-08-20 Merge branch 'ds/commit-graph-fsck'
2018-08-20 Merge branch 'jt/fetch-negotiator-skipping'
2018-08-20 Merge branch 'jc/gpg-status'
2018-08-20 Merge branch 'jc/update-index-doc'
2018-08-20 Merge branch 'en/update-index-doc'
2018-08-20 Merge branch 'js/typofixes'
2018-08-20 Merge branch 'sk/instaweb-rh-update'
2018-08-20 Merge branch 'en/t7406-fixes'
2018-08-20 Merge branch 'js/rebase-merges-exec-fix'
2018-08-20 Merge branch 'ab/test-must-be-empty-for-master'
2018-08-20 Merge branch 'ab/newhash-is-sha256'
2018-08-17 Merge branch 'nd/complete-config-vars'
2018-08-17 Merge branch 'ar/t4150-am-scissors-test-fix'
2018-08-17 Merge branch 'js/pull-rebase-type-shorthand'
2018-08-17 Merge branch 'jk/diff-rendered-docs'
2018-08-17 Merge branch 'hn/config-in-code-comment'
2018-08-17 Merge branch 'nd/config-blame-sort'
2018-08-17 Merge branch 'en/t3031-title-fix'
2018-08-17 Merge branch 'sb/indent-heuristic-optim'
2018-08-17 Merge branch 'en/abort-df-conflict-fixes'
2018-07-31 read-cache: fix directory/file conflict handling in...
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-01-09 Merge branch 'js/misc-git-gui-stuff' of ../git-gui
2017-12-05 Merge branch 'ls/no-double-utf8-author-name' of .....
2017-11-22 Merge branch 'jn/reproducible-build' of ../git-gui...
2017-11-09 Merge branch 'tz/fsf-address-update' of ../git-gui...
2017-10-28 Merge branch 'sg/rev-list-doc-reorder-fix'
2017-07-25 Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-06-24 Merge branch 'jc/diff-tree-stale-comment' into maint
2017-06-24 Merge branch 'jk/pack-idx-corruption-safety' into maint
2017-06-13 Merge branch 'jk/pack-idx-corruption-safety'
2017-06-13 Merge branch 'jc/diff-tree-stale-comment'
2017-06-05 Merge branch 'sg/core-filemode-doc-typofix' into maint
2017-05-29 Merge branch 'sg/core-filemode-doc-typofix'
2017-05-05 Merge branch 'maint-2.4' into maint-2.5
2017-05-01 Merge branch 'jk/prio-queue-avoid-swap-with-self'
2017-04-17 Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-04-17 Merge branch 'jc/unused-symbols'
2017-03-30 Merge branch 'bc/push-cert-receive-fix'
2017-03-28 Merge branch 'rs/path-name-safety-cleanup' into maint
2017-03-24 Merge branch 'rs/path-name-safety-cleanup'
2017-03-21 Merge branch 'jk/ewah-use-right-type-in-sizeof' into...
2017-03-13 Merge branch 'jk/ewah-use-right-type-in-sizeof'
2017-02-24 Merge branch 'bc/worktree-doc-fix-detached'
2017-01-18 Merge git://ozlabs.org/~paulus/gitk
2017-01-17 Merge branch 'sb/t3600-cleanup' into maint
2017-01-17 Merge branch 'bb/unicode-9.0' into maint
2016-12-19 Merge branch 'sb/t3600-cleanup'
2016-12-19 Merge branch 'bb/unicode-9.0'
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-29 Merge branch 'jk/reduce-gc-aggressive-depth' into maint
2016-09-29 Merge branch 'mr/vcs-svn-printf-ulong' into maint
2016-09-26 Merge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26 Merge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-21 Merge branch 'jk/reduce-gc-aggressive-depth'
2016-09-21 Merge branch 'mr/vcs-svn-printf-ulong'
2016-09-11 Merge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09 Merge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07 Merge branch 'sy/i18n' of git-gui
2016-08-31 Merge branch 'ls/packet-line-protocol-doc-fix'
2016-08-10 Merge branch 'js/commit-slab-decl-fix'
2016-08-10 Merge branch 'jc/grep-commandline-vs-configuration...
2016-08-10 Merge branch 'os/no-verify-skips-commit-msg-too' into...
2016-08-10 Merge branch 'ew/autoconf-pthread' into maint
2016-08-08 Merge branch 'sb/pack-protocol-doc-nak' into maint
2016-08-08 Merge branch 'jc/doc-diff-filter-exclude' into maint
2016-08-08 Merge branch 'lf/recv-sideband-cleanup' into maint
2016-08-08 Merge branch 'js/ignore-space-at-eol' into maint
2016-08-08 Merge branch 'jk/push-scrub-url' into maint
2016-08-04 Merge branch 'jc/grep-commandline-vs-configuration'
2016-08-04 Merge branch 'sb/pack-protocol-doc-nak'
2016-08-03 Merge branch 'jk/git-jump'
2016-08-03 Merge branch 'os/no-verify-skips-commit-msg-too'
2016-07-28 Merge branch 'js/t3404-grammo-fix' into maint
2016-07-28 Merge branch 'ew/gc-auto-pack-limit-fix' into maint
2016-07-28 Merge branch 'js/color-on-windows-comment' into maint
2016-07-28 Merge branch 'nd/ita-cleanup' into maint
2016-07-28 Merge branch 'js/find-commit-subject-ignore-leading...
2016-07-25 Merge branch 'ew/autoconf-pthread'
2016-07-25 Merge branch 'jk/push-scrub-url'
2016-07-25 Merge branch 'jc/doc-diff-filter-exclude'
2016-07-25 Merge branch 'js/ignore-space-at-eol'
next