Andrew's git - gitweb.git/history

[gitweb.git] / mergetools / smerge

2019-05-08	Merge branch 'tb/unexpected'	blob \| diff \| raw
2019-05-08	Merge branch 'nd/sha1-name-c-wo-the-repository'	blob \| diff \| raw
2019-05-08	Merge branch 'cc/replace-graft-peel-tags'	blob \| diff \| raw
2019-05-08	Merge branch 'js/trace2-to-directory'	blob \| diff \| raw
2019-05-08	Merge branch 'dl/merge-cleanup-scissors-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'jk/pack-objects-reports-num-objects-to...	blob \| diff \| raw
2019-05-08	Merge branch 'tz/git-svn-doc-markup-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'km/empty-repo-is-still-a-repo'	blob \| diff \| raw
2019-05-08	Merge branch 'dl/warn-tagging-a-tag'	blob \| diff \| raw
2019-05-08	Merge branch 'en/merge-directory-renames'	blob \| diff \| raw
2019-04-25	Merge branch 'js/macos-gettext-build'	blob \| diff \| raw
2019-04-25	Merge branch 'bs/sendemail-tighten-anything-by'	blob \| diff \| raw
2019-04-25	Merge branch 'bc/send-email-qp-cr'	blob \| diff \| raw
2019-04-25	Merge branch 'nd/submodule-foreach-quiet'	blob \| diff \| raw
2019-04-25	Merge branch 'js/iso8895-test-on-apfs'	blob \| diff \| raw
2019-04-25	Merge branch 'jc/gettext-test-fix'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/fetch-reachability-error-fix'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/xmalloc'	blob \| diff \| raw
2019-04-25	Merge branch 'km/t3000-retitle'	blob \| diff \| raw
2019-04-25	Merge branch 'js/untracked-cache-allocfix'	blob \| diff \| raw
2019-04-25	Merge branch 'js/t3301-unbreak-notes-test'	blob \| diff \| raw
2019-04-25	Merge branch 'tz/doc-apostrophe-no-longer-needed'	blob \| diff \| raw
2019-04-25	Merge branch 'sg/blame-in-bare-start-at-head'	blob \| diff \| raw
2019-04-25	Merge branch 'tg/ls-files-debug-format-fix'	blob \| diff \| raw
2019-04-25	Merge branch 'po/describe-not-necessarily-7'	blob \| diff \| raw
2019-04-25	Merge branch 'po/rerere-doc-fmt'	blob \| diff \| raw
2019-04-25	Merge branch 'sg/overlong-progress-fix'	blob \| diff \| raw
2019-04-25	Merge branch 'jt/batch-fetch-blobs-in-diff'	blob \| diff \| raw
2019-04-25	Merge branch 'ab/gc-docs'	blob \| diff \| raw
2019-04-25	Merge branch 'dl/submodule-set-branch'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/revision-rewritten-parents-in-prio...	blob \| diff \| raw
2019-04-25	Merge branch 'dk/blame-keep-origin-blob'	blob \| diff \| raw
2019-04-25	Merge branch 'bc/hash-transition-16'	blob \| diff \| raw
2019-04-25	Merge branch 'en/fast-import-parsing-fix'	blob \| diff \| raw
2019-04-25	Merge branch 'jt/fetch-no-update-shallow-in-proto-v2'	blob \| diff \| raw
2019-04-25	Merge branch 'jt/fetch-pack-wanted-refs-optim'	blob \| diff \| raw
2019-04-25	Merge branch 'ab/test-lib-pass-trace2-env'	blob \| diff \| raw
2019-04-25	Merge branch 'sg/index-pack-progress'	blob \| diff \| raw
2019-04-25	Merge branch 'ab/commit-graph-fixes'	blob \| diff \| raw
2019-04-25	Merge branch 'ab/gc-reflog'	blob \| diff \| raw
2019-04-25	Merge branch 'nd/checkout-m'	blob \| diff \| raw
2019-04-25	Merge branch 'js/difftool-no-index'	blob \| diff \| raw
2019-04-25	Merge branch 'pw/cherry-pick-continue'	blob \| diff \| raw
2019-04-25	Merge branch 'nd/commit-a-with-paths-msg-update'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/server-info-rabbit-hole'	blob \| diff \| raw
2019-04-25	Merge branch 'nd/diff-parseopt-4'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/unused-params-even-more'	blob \| diff \| raw
2019-04-25	Merge branch 'sg/test-atexit'	blob \| diff \| raw
2019-04-25	Merge branch 'ag/sequencer-reduce-rewriting-todo'	blob \| diff \| raw
2019-04-25	Merge branch 'bp/post-index-change-hook'	blob \| diff \| raw
2019-04-22	Merge branch 'da/smerge'	blob \| diff \| raw
2019-04-04	mergetools: add support for smerge (Sublime Merge)	blob \| diff \| raw