projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'maint-2.10' into maint-2.11
[git] / t / t6026-merge-attr.sh
2017-05-05  Junio C HamanoMerge branch 'maint-2.9' into maint-2.10 blob | commitdiff | raw
2017-05-05  Junio C HamanoMerge branch 'maint-2.8' into maint-2.9 blob | commitdiff | raw | diff to current
2017-05-05  Junio C HamanoMerge branch 'maint-2.4' into maint-2.5 blob | commitdiff | raw | diff to current
2017-02-02  Junio C HamanoMerge branch 'ws/request-pull-code-cleanup' into maint blob | commitdiff | raw
2017-01-31  Junio C HamanoMerge branch 'ad/bisect-terms' into maint blob | commitdiff | raw
2017-01-31  Junio C HamanoMerge branch 'jk/grep-e-could-be-extended-beyond-posix... blob | commitdiff | raw
2017-01-31  Junio C HamanoMerge branch 'km/branch-get-push-while-detached' into... blob | commitdiff | raw
2017-01-31  Junio C HamanoMerge branch 'nd/config-misc-fixes' into maint blob | commitdiff | raw
2017-01-31  Junio C HamanoMerge branch 'jc/abbrev-autoscale-config' into maint blob | commitdiff | raw
2017-01-31  Junio C HamanoMerge branch 'jc/latin-1' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'mm/gc-safety-doc' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'mm/push-social-engineering-attack-doc... blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jt/fetch-no-redundant-tag-fetch-map'... blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'ls/filter-process' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'kh/tutorial-grammofix' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'lr/doc-fix-cet' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'sb/t3600-cleanup' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jk/readme-gmane-is-no-more' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'sb/unpack-trees-grammofix' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'ak/lazy-prereq-mktemp' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'nd/qsort-in-merge-recursive' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'mk/mingw-winansi-ttyname-termination... blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'gv/p4-multi-path-commit-fix' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jk/difftool-in-subdir' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jc/push-default-explicit' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jt/mailinfo-fold-in-body-headers' into... blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jk/parseopt-usage-msg-opt' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jk/quote-env-path-list-component' into... blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'nd/shallow-fixup' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'da/mergetool-xxdiff-hotkey' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jc/pull-rebase-ff' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'js/normalize-path-copy-ceil' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'ak/commit-only-allow-empty' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'da/difftool-dir-diff-fix' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jk/stash-disable-renames-internally'... blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jk/http-walker-limit-redirect' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jc/renormalize-merge-kill-safer-crlf... blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'da/mergetool-trust-exit-code' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'bw/push-dry-run' into maint blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'hv/submodule-not-yet-pushed-fix' into... blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'jk/rev-parse-symbolic-parents-fix' into... blob | commitdiff | raw
2017-01-17  Junio C HamanoMerge branch 'bb/unicode-9.0' into maint blob | commitdiff | raw
2016-12-06  Junio C HamanoMerge branch 'ew/http-walker' into jk/http-walker-limit... blob | commitdiff | raw | diff to current
2016-12-05  Junio C HamanoMerge branch 'jk/common-main' into maint-2.10 blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'tk/diffcore-delta-remove-unused' into... blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'jk/create-branch-remove-unused-param... blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'nd/worktree-lock' into maint blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'ps/common-info-doc' into maint blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'rs/cocci' into maint blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'nd/test-helpers' into maint blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'sc/fmt-merge-msg-doc-markup-fix' into... blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'rs/commit-pptr-simplify' into maint blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'jk/rebase-config-insn-fmt-docfix' into... blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'ak/pre-receive-hook-template-modefix... blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'ls/macos-update' into maint blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'as/merge-attr-sleep' into maint blob | commitdiff | raw
2016-11-29  Junio C HamanoMerge branch 'jk/daemon-path-ok-check-truncation' into... blob | commitdiff | raw | diff to current
2016-11-29  Junio C HamanoMerge branch 'mm/send-email-cc-cruft-after-address... blob | commitdiff | raw | diff to current
2016-11-29  Junio C HamanoMerge branch 'cp/completion-negative-refs' into maint blob | commitdiff | raw | diff to current
2016-11-29  Junio C HamanoMerge branch 'jc/am-read-author-file' into maint blob | commitdiff | raw | diff to current
2016-11-29  Junio C HamanoMerge branch 'jk/common-main' blob | commitdiff | raw
2016-11-23  Junio C HamanoMerge branch 'jt/trailer-with-cruft' blob | commitdiff | raw
2016-11-23  Junio C HamanoMerge branch 'js/rebase-i-commentchar-fix' blob | commitdiff | raw
2016-11-23  Junio C HamanoMerge branch 'jc/for-each-ref-head-segfault-fix' blob | commitdiff | raw
2016-11-22  Junio C HamanoMerge branch 'js/prepare-sequencer' blob | commitdiff | raw
2016-11-22  Jiang XinMerge branch 'master' of git://github.com/git-l10n... blob | commitdiff | raw
2016-11-17  Junio C HamanoMerge branch 'tk/diffcore-delta-remove-unused' blob | commitdiff | raw
2016-11-17  Junio C HamanoMerge branch 'jk/create-branch-remove-unused-param' blob | commitdiff | raw
2016-11-17  Junio C HamanoMerge branch 'nd/worktree-lock' blob | commitdiff | raw
2016-11-11  Junio C HamanoMerge branch 'rt/fetch-pack-error-message-fix' blob | commitdiff | raw
2016-11-11  Junio C HamanoMerge branch 'ps/common-info-doc' blob | commitdiff | raw
2016-11-11  Junio C HamanoMerge branch 'ls/filter-process' blob | commitdiff | raw
2016-11-11  Junio C HamanoMerge branch 'js/pwd-var-vs-pwd-cmd-fix' blob | commitdiff | raw
2016-11-11  Junio C HamanoMerge branch 'as/merge-attr-sleep' blob | commitdiff | raw
2016-11-11  Junio C HamanoMerge branch 'ls/macos-update' blob | commitdiff | raw
2016-11-11  Junio C HamanoMerge branch 'js/prepare-sequencer' blob | commitdiff | raw
2016-11-11  Johannes Sixtt6026: clarify the point of "kill $(cat sleep.pid)" blob | commitdiff | raw
2016-11-10  Johannes Schindelint6026: ensure that long-running script really is blob | commitdiff | raw | diff to current
2016-11-10  Junio C HamanoRevert "t6026-merge-attr: don't fail if sleep exits... blob | commitdiff | raw | diff to current
2016-11-10  Junio C HamanoRevert "t6026-merge-attr: ensure that the merge driver... blob | commitdiff | raw | diff to current
2016-11-10  Andreas Schwabt6026-merge-attr: ensure that the merge driver was... blob | commitdiff | raw | diff to current
2016-11-08  Andreas Schwabt6026-merge-attr: don't fail if sleep exits early blob | commitdiff | raw | diff to current
2016-11-02  Jiang XinMerge branch 'russian-l10n' of https://github.com/DJm00... blob | commitdiff | raw | diff to current
2016-10-31  Junio C HamanoMerge branch 'nd/test-helpers' blob | commitdiff | raw | diff to current
2016-10-31  Junio C HamanoMerge branch 'sc/fmt-merge-msg-doc-markup-fix' blob | commitdiff | raw | diff to current
2016-10-31  Junio C HamanoMerge branch 'rs/commit-pptr-simplify' blob | commitdiff | raw | diff to current
2016-10-31  Junio C HamanoMerge branch 'jk/rebase-config-insn-fmt-docfix' blob | commitdiff | raw | diff to current
2016-10-31  Junio C HamanoMerge branch 'ak/pre-receive-hook-template-modefix' blob | commitdiff | raw | diff to current
2016-10-31  Junio C HamanoMerge branch 'jk/common-main' blob | commitdiff | raw | diff to current
2016-10-28  Junio C HamanoMerge branch 'pb/test-parse-options-expect' into maint blob | commitdiff | raw | diff to current
2016-10-28  Junio C HamanoMerge branch 'rs/cocci' into maint blob | commitdiff | raw | diff to current
2016-10-28  Junio C HamanoMerge branch 'rs/pretty-format-color-doc-fix' into... blob | commitdiff | raw | diff to current
2016-10-28  Junio C HamanoMerge branch 'js/reset-usage' into maint blob | commitdiff | raw | diff to current
2016-10-28  Junio C HamanoMerge branch 'po/fix-doc-merge-base-illustration' into... blob | commitdiff | raw | diff to current
2016-10-28  Junio C HamanoMerge branch 'jk/tap-verbose-fix' into maint blob | commitdiff | raw | diff to current
2016-10-28  Junio C HamanoMerge branch 'tg/add-chmod+x-fix' into maint blob | commitdiff | raw | diff to current
2016-10-28  Junio C HamanoMerge branch 'bw/submodule-branch-dot-doc' into maint blob | commitdiff | raw | diff to current
2016-10-28  Junio C HamanoMerge branch 'jk/tighten-alloc' into maint blob | commitdiff | raw | diff to current
2016-10-28  Junio C HamanoMerge branch 'jk/fetch-quick-tag-following' into maint blob | commitdiff | raw | diff to current
2016-10-28  Junio C HamanoMerge 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.