git.oblomov.eu Git - git/history - t/t3507-cherry-pick-conflict.sh

[git] / t / t3507-cherry-pick-conflict.sh

2019-05-13	Junio C Hamano	Merge branch 'jh/trace2'	blob \| commitdiff \| raw
2019-05-13	Junio C Hamano	Merge branch 'cc/access-on-aix-workaround'	blob \| commitdiff \| raw
2019-05-13	Junio C Hamano	Merge branch 'pw/clean-sequencer-state-upon-final-commit'	blob \| commitdiff \| raw
2019-05-13	Junio C Hamano	Merge branch 'pw/rebase-i-internal'	blob \| commitdiff \| raw \| diff to current
2019-05-13	Junio C Hamano	Merge branch 'jk/perf-aggregate-wo-libjson'	blob \| commitdiff \| raw \| diff to current
2019-05-13	Junio C Hamano	Merge branch 'dl/rev-tilde-doc-clarify'	blob \| commitdiff \| raw \| diff to current
2019-05-13	Junio C Hamano	Merge branch 'jc/make-dedup-ls-files-output'	blob \| commitdiff \| raw \| diff to current
2019-05-13	Junio C Hamano	Merge branch 'jk/ls-files-doc-markup-fix'	blob \| commitdiff \| raw \| diff to current
2019-05-13	Junio C Hamano	Merge branch 'jk/p5302-avoid-collision-check-cost'	blob \| commitdiff \| raw \| diff to current
2019-05-13	Junio C Hamano	Merge branch 'dl/no-extern-in-func-decl'	blob \| commitdiff \| raw \| diff to current
2019-05-13	Junio C Hamano	Merge branch 'ew/repack-with-bitmaps-by-default'	blob \| commitdiff \| raw \| diff to current
2019-05-13	Junio C Hamano	Merge branch 'js/partial-clone-connectivity-check'	blob \| commitdiff \| raw \| diff to current
2019-05-13	Junio C Hamano	Merge branch 'jh/trace2-sid-fix'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'vk/autoconf-gettext'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'cc/aix-has-fileno-as-a-macro'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'jt/submodule-repo-is-with-worktree'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'jk/untracked-cache-more-fixes'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'jk/prune-optim'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'js/misc-doc-fixes'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'dr/ref-filter-push-track-fix'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'ss/msvc-path-utils-fix'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'jt/clone-server-option'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'tb/unexpected'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'nd/sha1-name-c-wo-the-repository'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'cc/replace-graft-peel-tags'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'js/trace2-to-directory'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'dl/merge-cleanup-scissors-fix'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'jk/pack-objects-reports-num-objects-to...	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'tz/git-svn-doc-markup-fix'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'km/empty-repo-is-still-a-repo'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'dl/warn-tagging-a-tag'	blob \| commitdiff \| raw \| diff to current
2019-05-08	Junio C Hamano	Merge branch 'en/merge-directory-renames'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'js/macos-gettext-build'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'bs/sendemail-tighten-anything-by'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'bc/send-email-qp-cr'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'nd/submodule-foreach-quiet'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'js/iso8895-test-on-apfs'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'jc/gettext-test-fix'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'jk/fetch-reachability-error-fix'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'jk/xmalloc'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'km/t3000-retitle'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'js/untracked-cache-allocfix'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'js/t3301-unbreak-notes-test'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'tz/doc-apostrophe-no-longer-needed'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'sg/blame-in-bare-start-at-head'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'tg/ls-files-debug-format-fix'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'po/describe-not-necessarily-7'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'po/rerere-doc-fmt'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'sg/overlong-progress-fix'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'jt/batch-fetch-blobs-in-diff'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'ab/gc-docs'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'dl/submodule-set-branch'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'jk/revision-rewritten-parents-in-prio...	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'dk/blame-keep-origin-blob'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'bc/hash-transition-16'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'en/fast-import-parsing-fix'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'jt/fetch-no-update-shallow-in-proto-v2'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'jt/fetch-pack-wanted-refs-optim'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'ab/test-lib-pass-trace2-env'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'sg/index-pack-progress'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'ab/commit-graph-fixes'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'ab/gc-reflog'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'nd/checkout-m'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'js/difftool-no-index'	blob \| commitdiff \| raw \| diff to current
2019-04-25	Junio C Hamano	Merge branch 'pw/cherry-pick-continue'	blob \| commitdiff \| raw \| diff to current
2019-04-19	Denton Liu	cherry-pick/revert: add scissors line on merge conflict	blob \| commitdiff \| raw \| diff to current
2019-04-18	Denton Liu	t3507: clean up style	blob \| commitdiff \| raw \| diff to current
2019-04-17	Phillip Wood	commit/reset: try to clean up sequencer state	blob \| commitdiff \| raw \| diff to current
2019-04-09	Junio C Hamano	Merge branch 'ja/dir-rename-doc-markup-fix'	blob \| commitdiff \| raw \| diff to current
2019-03-20	Junio C Hamano	Merge branch 'jk/virtual-objects-do-exist'	blob \| commitdiff \| raw \| diff to current
2019-03-18	Phillip Wood	cherry-pick --continue: remember options	blob \| commitdiff \| raw \| diff to current
2019-03-18	Phillip Wood	cherry-pick: demonstrate option amnesia	blob \| commitdiff \| raw \| diff to current
2019-03-18	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2019-03-11	Junio C Hamano	Merge branch 'js/rebase-recreate-merge'	blob \| commitdiff \| raw \| diff to current
2019-03-07	Junio C Hamano	Merge branch 'ab/receive-pack-use-after-free-fix'	blob \| commitdiff \| raw \| diff to current
2019-03-07	Junio C Hamano	Merge branch 'rj/prune-packed-excess-args'	blob \| commitdiff \| raw \| diff to current
2019-02-14	Junio C Hamano	Merge branch 'jc/no-grepping-for-strerror-in-tests'	blob \| commitdiff \| raw \| diff to current
2019-02-14	Junio C Hamano	Merge branch 'kd/t0028-octal-del-is-377-not-777'	blob \| commitdiff \| raw \| diff to current
2019-02-14	Junio C Hamano	Merge branch 'rj/sequencer-sign-off-header-static'	blob \| commitdiff \| raw \| diff to current
2019-02-07	Junio C Hamano	Merge branch 'ma/doc-diff-usage-fix'	blob \| commitdiff \| raw \| diff to current
2019-02-07	Junio C Hamano	Merge branch 'ss/describe-dirty-in-the-right-directory'	blob \| commitdiff \| raw \| diff to current
2019-02-07	Junio C Hamano	Merge branch 'lt/date-human'	blob \| commitdiff \| raw \| diff to current
2019-02-05	Junio C Hamano	Merge branch 'bp/checkout-new-branch-optim'	blob \| commitdiff \| raw \| diff to current
2019-02-05	Junio C Hamano	Merge branch 'cc/test-ref-store-typofix'	blob \| commitdiff \| raw \| diff to current
2019-02-05	Junio C Hamano	Merge branch 'sg/obstack-cast-function-type-fix'	blob \| commitdiff \| raw \| diff to current
2019-01-29	Junio C Hamano	Merge branch 'js/add-e-clear-patch-before-stating'	blob \| commitdiff \| raw \| diff to current
2019-01-29	Junio C Hamano	Merge branch 'cc/fetch-error-message-fix'	blob \| commitdiff \| raw \| diff to current
2019-01-29	Junio C Hamano	Merge branch 'cc/partial-clone-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2019-01-18	Junio C Hamano	Merge branch 'jk/dev-build-format-security'	blob \| commitdiff \| raw \| diff to current
2019-01-14	Junio C Hamano	Merge branch 'md/exclude-promisor-objects-fix-cleanup'	blob \| commitdiff \| raw \| diff to current
2019-01-14	Junio C Hamano	Merge branch 'hn/highlight-sideband-keywords'	blob \| commitdiff \| raw \| diff to current
2019-01-14	Junio C Hamano	Merge branch 'hb/t0061-dot-in-path-fix'	blob \| commitdiff \| raw \| diff to current
2019-01-03	Junio C Hamano	Merge branch 'sg/test-bash-version-fix'	blob \| commitdiff \| raw \| diff to current
2018-12-15	Junio C Hamano	Merge branch 'jc/run-command-report-exec-failure-fix...	blob \| commitdiff \| raw \| diff to current
2018-12-15	Junio C Hamano	Merge branch 'nd/show-gitcomp-compilation-fix' into...	blob \| commitdiff \| raw \| diff to current
2018-12-15	Junio C Hamano	Merge branch 'js/mailinfo-format-flowed-fix' into maint	blob \| commitdiff \| raw \| diff to current
2018-12-13	Jiang Xin	Merge branch 'master' of github.com:linusboyle/git	blob \| commitdiff \| raw \| diff to current
2018-12-04	Junio C Hamano	Merge branch 'en/rebase-consistency'	blob \| commitdiff \| raw \| diff to current
2018-12-01	Junio C Hamano	Merge branch 'rt/rebase-in-c-message-fix'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom