git.oblomov.eu Git - git/history - t/t6026-merge-attr.sh

2017-01-17	Junio C Hamano	Merge branch 'gv/p4-multi-path-commit-fix' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/difftool-in-subdir' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jc/push-default-explicit' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jt/mailinfo-fold-in-body-headers' into...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/parseopt-usage-msg-opt' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/quote-env-path-list-component' into...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'nd/shallow-fixup' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'da/mergetool-xxdiff-hotkey' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jc/pull-rebase-ff' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'js/normalize-path-copy-ceil' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'ak/commit-only-allow-empty' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'da/difftool-dir-diff-fix' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/stash-disable-renames-internally'...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/http-walker-limit-redirect' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jc/renormalize-merge-kill-safer-crlf...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'da/mergetool-trust-exit-code' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'bw/push-dry-run' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'hv/submodule-not-yet-pushed-fix' into...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/rev-parse-symbolic-parents-fix' into...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'bb/unicode-9.0' into maint	blob \| commitdiff \| raw
2016-12-06	Junio C Hamano	Merge branch 'ew/http-walker' into jk/http-walker-limit...	blob \| commitdiff \| raw \| diff to current
2016-12-05	Junio C Hamano	Merge branch 'jk/common-main' into maint-2.10	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'tk/diffcore-delta-remove-unused' into...	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'jk/create-branch-remove-unused-param...	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'nd/worktree-lock' into maint	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'ps/common-info-doc' into maint	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'rs/cocci' into maint	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'nd/test-helpers' into maint	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into...	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'rs/commit-pptr-simplify' into maint	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'jk/rebase-config-insn-fmt-docfix' into...	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'ak/pre-receive-hook-template-modefix...	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'ls/macos-update' into maint	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'as/merge-attr-sleep' into maint	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'jk/daemon-path-ok-check-truncation' into...	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'mm/send-email-cc-cruft-after-address...	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'cp/completion-negative-refs' into maint	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'jc/am-read-author-file' into maint	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'jk/common-main'	blob \| commitdiff \| raw
2016-11-23	Junio C Hamano	Merge branch 'jt/trailer-with-cruft'	blob \| commitdiff \| raw
2016-11-23	Junio C Hamano	Merge branch 'js/rebase-i-commentchar-fix'	blob \| commitdiff \| raw
2016-11-23	Junio C Hamano	Merge branch 'jc/for-each-ref-head-segfault-fix'	blob \| commitdiff \| raw
2016-11-22	Junio C Hamano	Merge branch 'js/prepare-sequencer'	blob \| commitdiff \| raw
2016-11-22	Jiang Xin	Merge branch 'master' of git://github.com/git-l10n...	blob \| commitdiff \| raw
2016-11-17	Junio C Hamano	Merge branch 'tk/diffcore-delta-remove-unused'	blob \| commitdiff \| raw
2016-11-17	Junio C Hamano	Merge branch 'jk/create-branch-remove-unused-param'	blob \| commitdiff \| raw
2016-11-17	Junio C Hamano	Merge branch 'nd/worktree-lock'	blob \| commitdiff \| raw
2016-11-11	Junio C Hamano	Merge branch 'rt/fetch-pack-error-message-fix'	blob \| commitdiff \| raw
2016-11-11	Junio C Hamano	Merge branch 'ps/common-info-doc'	blob \| commitdiff \| raw
2016-11-11	Junio C Hamano	Merge branch 'js/pwd-var-vs-pwd-cmd-fix'	blob \| commitdiff \| raw
2016-11-11	Junio C Hamano	Merge branch 'ls/macos-update'	blob \| commitdiff \| raw
2016-11-11	Junio C Hamano	Merge branch 'js/prepare-sequencer'	blob \| commitdiff \| raw
2016-11-11	Junio C Hamano	Merge branch 'ls/filter-process'	blob \| commitdiff \| raw
2016-11-11	Junio C Hamano	Merge branch 'as/merge-attr-sleep'	blob \| commitdiff \| raw
2016-11-11	Johannes Sixt	t6026: clarify the point of "kill $(cat sleep.pid)"	blob \| commitdiff \| raw
2016-11-10	Johannes Schindelin	t6026: ensure that long-running script really is	blob \| commitdiff \| raw \| diff to current
2016-11-10	Junio C Hamano	Revert "t6026-merge-attr: don't fail if sleep exits...	blob \| commitdiff \| raw \| diff to current
2016-11-10	Junio C Hamano	Revert "t6026-merge-attr: ensure that the merge driver...	blob \| commitdiff \| raw \| diff to current
2016-11-10	Andreas Schwab	t6026-merge-attr: ensure that the merge driver was...	blob \| commitdiff \| raw \| diff to current
2016-11-08	Andreas Schwab	t6026-merge-attr: don't fail if sleep exits early	blob \| commitdiff \| raw \| diff to current
2016-11-02	Jiang Xin	Merge branch 'russian-l10n' of https://github.com/DJm00...	blob \| commitdiff \| raw \| diff to current
2016-10-31	Junio C Hamano	Merge branch 'nd/test-helpers'	blob \| commitdiff \| raw \| diff to current
2016-10-31	Junio C Hamano	Merge branch 'sc/fmt-merge-msg-doc-markup-fix'	blob \| commitdiff \| raw \| diff to current
2016-10-31	Junio C Hamano	Merge branch 'rs/commit-pptr-simplify'	blob \| commitdiff \| raw \| diff to current
2016-10-31	Junio C Hamano	Merge branch 'jk/rebase-config-insn-fmt-docfix'	blob \| commitdiff \| raw \| diff to current
2016-10-31	Junio C Hamano	Merge branch 'ak/pre-receive-hook-template-modefix'	blob \| commitdiff \| raw \| diff to current
2016-10-31	Junio C Hamano	Merge branch 'jk/common-main'	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'pb/test-parse-options-expect' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'rs/cocci' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'rs/pretty-format-color-doc-fix' into...	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'js/reset-usage' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'po/fix-doc-merge-base-illustration' into...	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'jk/tap-verbose-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'tg/add-chmod+x-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'bw/submodule-branch-dot-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'jk/tighten-alloc' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'jk/fetch-quick-tag-following' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'jk/merge-base-fork-point-without-reflog...	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'sb/submodule-config-doc-drop-path' into...	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'nd/commit-p-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'jk/clone-copy-alternates-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'dp/autoconf-curl-ssl' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'ak/curl-imap-send-explicit-scheme' into...	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'js/regexec-buf' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'rs/c-auto-resets-attributes' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'yk/git-tag-remove-mention-of-old-layout...	blob \| commitdiff \| raw \| diff to current
2016-10-27	Junio C Hamano	Merge branch 'jk/daemon-path-ok-check-truncation'	blob \| commitdiff \| raw \| diff to current
2016-10-27	Junio C Hamano	Merge branch 'sb/submodule-ignore-trailing-slash'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'ex/deprecate-empty-pathspec-as-match...	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'po/fix-doc-merge-base-illustration'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'jk/tap-verbose-fix'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'mm/send-email-cc-cruft-after-address'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'yk/git-tag-remove-mention-of-old-layout...	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'jk/diff-submodule-diff-inline'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'tg/add-chmod+x-fix'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'bw/submodule-branch-dot-doc'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'pb/test-parse-options-expect'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'jk/tighten-alloc'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'jk/fetch-quick-tag-following'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'jk/merge-base-fork-point-without-reflog'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom