Andrew's git - gitweb.git/history - t/t6026-merge-attr.sh

[gitweb.git] / t / t6026-merge-attr.sh

2016-11-29	Merge branch 'jk/rebase-config-insn-fmt-docfix' into...	blob \| diff \| raw
2016-11-29	Merge branch 'ak/pre-receive-hook-template-modefix...	blob \| diff \| raw
2016-11-29	Merge branch 'ls/macos-update' into maint	blob \| diff \| raw
2016-11-29	Merge branch 'as/merge-attr-sleep' into maint	blob \| diff \| raw
2016-11-29	Merge branch 'jk/daemon-path-ok-check-truncation' into...	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'mm/send-email-cc-cruft-after-address...	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'cp/completion-negative-refs' into maint	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'jc/am-read-author-file' into maint	blob \| diff \| raw \| diff to current
2016-11-29	Merge branch 'jk/common-main'	blob \| diff \| raw
2016-11-23	Merge branch 'jt/trailer-with-cruft'	blob \| diff \| raw
2016-11-23	Merge branch 'js/rebase-i-commentchar-fix'	blob \| diff \| raw
2016-11-23	Merge branch 'jc/for-each-ref-head-segfault-fix'	blob \| diff \| raw
2016-11-22	Merge branch 'js/prepare-sequencer'	blob \| diff \| raw
2016-11-22	Merge branch 'master' of git://github.com/git-l10n...	blob \| diff \| raw
2016-11-17	Merge branch 'tk/diffcore-delta-remove-unused'	blob \| diff \| raw
2016-11-17	Merge branch 'jk/create-branch-remove-unused-param'	blob \| diff \| raw
2016-11-17	Merge branch 'nd/worktree-lock'	blob \| diff \| raw
2016-11-11	Merge branch 'rt/fetch-pack-error-message-fix'	blob \| diff \| raw
2016-11-11	Merge branch 'ps/common-info-doc'	blob \| diff \| raw
2016-11-11	Merge branch 'ls/filter-process'	blob \| diff \| raw
2016-11-11	Merge branch 'js/pwd-var-vs-pwd-cmd-fix'	blob \| diff \| raw
2016-11-11	Merge branch 'as/merge-attr-sleep'	blob \| diff \| raw
2016-11-11	Merge branch 'ls/macos-update'	blob \| diff \| raw
2016-11-11	Merge branch 'js/prepare-sequencer'	blob \| diff \| raw
2016-11-11	t6026: clarify the point of "kill $(cat sleep.pid)"	blob \| diff \| raw
2016-11-10	t6026: ensure that long-running script really is	blob \| diff \| raw \| diff to current
2016-11-10	Revert "t6026-merge-attr: don't fail if sleep exits...	blob \| diff \| raw \| diff to current
2016-11-10	Revert "t6026-merge-attr: ensure that the merge driver...	blob \| diff \| raw \| diff to current
2016-11-10	t6026-merge-attr: ensure that the merge driver was...	blob \| diff \| raw \| diff to current
2016-11-08	t6026-merge-attr: don't fail if sleep exits early	blob \| diff \| raw \| diff to current
2016-11-02	Merge branch 'russian-l10n' of https://github.com/DJm00...	blob \| diff \| raw \| diff to current
2016-10-31	Merge branch 'nd/test-helpers'	blob \| diff \| raw \| diff to current
2016-10-31	Merge branch 'sc/fmt-merge-msg-doc-markup-fix'	blob \| diff \| raw \| diff to current
2016-10-31	Merge branch 'rs/commit-pptr-simplify'	blob \| diff \| raw \| diff to current
2016-10-31	Merge branch 'jk/rebase-config-insn-fmt-docfix'	blob \| diff \| raw \| diff to current
2016-10-31	Merge branch 'ak/pre-receive-hook-template-modefix'	blob \| diff \| raw \| diff to current
2016-10-31	Merge branch 'jk/common-main'	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'pb/test-parse-options-expect' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'rs/cocci' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'rs/pretty-format-color-doc-fix' into...	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'js/reset-usage' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'po/fix-doc-merge-base-illustration' into...	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'jk/tap-verbose-fix' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'tg/add-chmod+x-fix' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'bw/submodule-branch-dot-doc' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'jk/tighten-alloc' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'jk/fetch-quick-tag-following' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'jk/merge-base-fork-point-without-reflog...	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'sb/submodule-config-doc-drop-path' into...	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'nd/commit-p-doc' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'jk/clone-copy-alternates-fix' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'dp/autoconf-curl-ssl' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'ak/curl-imap-send-explicit-scheme' into...	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'js/regexec-buf' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'rs/c-auto-resets-attributes' into maint	blob \| diff \| raw \| diff to current
2016-10-28	Merge branch 'yk/git-tag-remove-mention-of-old-layout...	blob \| diff \| raw \| diff to current
2016-10-27	Merge branch 'jk/daemon-path-ok-check-truncation'	blob \| diff \| raw \| diff to current
2016-10-27	Merge branch 'sb/submodule-ignore-trailing-slash'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'ex/deprecate-empty-pathspec-as-match...	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'po/fix-doc-merge-base-illustration'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'jk/tap-verbose-fix'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'mm/send-email-cc-cruft-after-address'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'yk/git-tag-remove-mention-of-old-layout...	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'jk/diff-submodule-diff-inline'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'tg/add-chmod+x-fix'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'bw/submodule-branch-dot-doc'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'pb/test-parse-options-expect'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'jk/tighten-alloc'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'jk/fetch-quick-tag-following'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'jk/merge-base-fork-point-without-reflog'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'mm/credential-libsecret'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'js/libify-require-clean-work-tree'	blob \| diff \| raw \| diff to current
2016-10-26	Merge branch 'jc/ws-error-highlight'	blob \| diff \| raw \| diff to current
2016-10-20	Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2016-10-17	Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com...	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'sb/submodule-config-doc-drop-path'	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'rs/pretty-format-color-doc-fix'	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'js/reset-usage'	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'rs/cocci'	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'js/regexec-buf'	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'nd/commit-p-doc'	blob \| diff \| raw \| diff to current
2016-10-17	Merge branch 'jk/clone-copy-alternates-fix'	blob \| diff \| raw \| diff to current
2016-10-16	Merge branch 'russian-l10n' of https://github.com/DJm00...	blob \| diff \| raw \| diff to current
2016-10-11	Merge branch 'jk/verify-packfile-gently' into maint	blob \| diff \| raw \| diff to current
2016-10-11	Merge branch 'jc/verify-loose-object-header' into maint	blob \| diff \| raw \| diff to current
2016-10-11	Merge branch 'rs/git-gui-use-modern-git-merge-syntax...	blob \| diff \| raw \| diff to current
2016-10-11	Merge branch 'pb/rev-list-reverse-with-count' into...	blob \| diff \| raw \| diff to current
2016-10-11	Merge branch 'jk/graph-padding-fix' into maint	blob \| diff \| raw \| diff to current
2016-10-11	Merge branch 'rs/copy-array' into maint	blob \| diff \| raw \| diff to current
2016-10-10	Merge branch 'jc/blame-reverse'	blob \| diff \| raw \| diff to current
2016-10-10	Merge branch 'nd/shallow-deepen'	blob \| diff \| raw \| diff to current
2016-10-10	Merge branch 'cp/completion-negative-refs'	blob \| diff \| raw \| diff to current
2016-10-10	Merge branch 'dp/autoconf-curl-ssl'	blob \| diff \| raw \| diff to current
2016-10-10	Merge branch 'ak/curl-imap-send-explicit-scheme'	blob \| diff \| raw \| diff to current
2016-10-10	Merge branch 'jk/pack-objects-optim-mru'	blob \| diff \| raw \| diff to current
2016-10-06	Merge branch 'rs/cocci'	blob \| diff \| raw \| diff to current
2016-10-06	Merge branch 'rs/c-auto-resets-attributes'	blob \| diff \| raw \| diff to current
2016-10-06	Merge branch 'jk/graph-padding-fix'	blob \| diff \| raw \| diff to current
2016-10-03	Merge branch 'pb/rev-list-reverse-with-count'	blob \| diff \| raw \| diff to current
2016-10-03	Merge branch 'mh/diff-indent-heuristic'	blob \| diff \| raw \| diff to current
next