Merge branch 'pw/rebase-abort-clean-rewritten' into maint
[gitweb.git] / mergetools / smerge
2019-04-25 Merge branch 'jk/xmalloc'
2019-04-25 Merge branch 'km/t3000-retitle'
2019-04-25 Merge branch 'js/untracked-cache-allocfix'
2019-04-25 Merge branch 'js/t3301-unbreak-notes-test'
2019-04-25 Merge branch 'tz/doc-apostrophe-no-longer-needed'
2019-04-25 Merge branch 'sg/blame-in-bare-start-at-head'
2019-04-25 Merge branch 'tg/ls-files-debug-format-fix'
2019-04-25 Merge branch 'po/describe-not-necessarily-7'
2019-04-25 Merge branch 'po/rerere-doc-fmt'
2019-04-25 Merge branch 'sg/overlong-progress-fix'
2019-04-25 Merge branch 'jt/batch-fetch-blobs-in-diff'
2019-04-25 Merge branch 'ab/gc-docs'
2019-04-25 Merge branch 'dl/submodule-set-branch'
2019-04-25 Merge branch 'jk/revision-rewritten-parents-in-prio...
2019-04-25 Merge branch 'dk/blame-keep-origin-blob'
2019-04-25 Merge branch 'bc/hash-transition-16'
2019-04-25 Merge branch 'en/fast-import-parsing-fix'
2019-04-25 Merge branch 'jt/fetch-no-update-shallow-in-proto-v2'
2019-04-25 Merge branch 'jt/fetch-pack-wanted-refs-optim'
2019-04-25 Merge branch 'ab/test-lib-pass-trace2-env'
2019-04-25 Merge branch 'sg/index-pack-progress'
2019-04-25 Merge branch 'ab/commit-graph-fixes'
2019-04-25 Merge branch 'ab/gc-reflog'
2019-04-25 Merge branch 'nd/checkout-m'
2019-04-25 Merge branch 'js/difftool-no-index'
2019-04-25 Merge branch 'pw/cherry-pick-continue'
2019-04-25 Merge branch 'nd/commit-a-with-paths-msg-update'
2019-04-25 Merge branch 'jk/server-info-rabbit-hole'
2019-04-25 Merge branch 'nd/diff-parseopt-4'
2019-04-25 Merge branch 'jk/unused-params-even-more'
2019-04-25 Merge branch 'sg/test-atexit'
2019-04-25 Merge branch 'ag/sequencer-reduce-rewriting-todo'
2019-04-25 Merge branch 'bp/post-index-change-hook'
2019-04-22 Merge branch 'da/smerge'
2019-04-04 mergetools: add support for smerge (Sublime Merge)