projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
t/helper: merge test-sha1 into test-tool
[git] / t / t7600-merge.sh
2018-03-22  Junio C HamanoSync with Git 2.16.3 blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'sm/mv-dry-run-update' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'gs/test-unset-xdg-cache-home' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'sb/status-doc-fix' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'bp/fsmonitor' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix'... blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'sg/doc-test-must-fail-args' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'nd/ignore-glob-doc-update' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'tz/doc-show-defaults-to-head' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'jc/mailinfo-cleanup-fix' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'rb/hashmap-h-compilation-fix' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'cl/t9001-cleanup' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'jt/fsck-code-cleanup' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'nd/diff-flush-before-warning' into maint blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'sg/travis-build-during-script-phase'... blob | commitdiff | raw | diff to current
2018-03-21  Junio C HamanoMerge branch 'jk/attributes-path-doc' blob | commitdiff | raw
2018-03-21  Junio C HamanoMerge branch 'rj/warning-uninitialized-fix' blob | commitdiff | raw
2018-03-21  Junio C HamanoMerge branch 'tz/complete-tag-delete-tagname' blob | commitdiff | raw
2018-03-21  Junio C HamanoMerge branch 'ml/filter-branch-portability-fix' blob | commitdiff | raw
2018-03-21  Junio C HamanoMerge branch 'js/ming-strftime' blob | commitdiff | raw
2018-03-21  Junio C HamanoMerge branch 'dp/merge-strategy-doc-fix' blob | commitdiff | raw
2018-03-21  Junio C HamanoMerge branch 'rj/http-code-cleanup' blob | commitdiff | raw
2018-03-21  Junio C HamanoMerge branch 'ks/t3200-typofix' blob | commitdiff | raw
2018-03-21  Junio C HamanoMerge branch 'bp/refresh-cache-ent-rehash-fix' blob | commitdiff | raw
2018-03-21  Junio C HamanoMerge branch 'jh/fsck-promisors' blob | commitdiff | raw
2018-03-21  Junio C HamanoMerge branch 'ma/skip-writing-unchanged-index' blob | commitdiff | raw
2018-03-21  Junio C HamanoMerge branch 'ma/config-page-only-in-list-mode' blob | commitdiff | raw
2018-03-15  Junio C HamanoMerge branch 'tl/userdiff-csharp-async' blob | commitdiff | raw
2018-03-15  Junio C HamanoMerge branch 'sg/cvs-tests-with-x' blob | commitdiff | raw
2018-03-15  Junio C HamanoMerge branch 'ab/man-sec-list' blob | commitdiff | raw
2018-03-15  Junio C HamanoMerge branch 'ab/perl-fixes' blob | commitdiff | raw
2018-03-15  Junio C HamanoMerge branch 'cl/send-email-reply-to' blob | commitdiff | raw
2018-03-15  Junio C HamanoMerge branch 'np/send-email-header-parsing' blob | commitdiff | raw
2018-03-14  Junio C HamanoMerge branch 'nd/parseopt-completion' blob | commitdiff | raw
2018-03-14  Junio C HamanoMerge branch 'nd/object-allocation-comments' blob | commitdiff | raw
2018-03-14  Junio C HamanoMerge branch 'jk/smart-http-protocol-doc-fix' blob | commitdiff | raw
2018-03-14  Junio C HamanoMerge branch 'jk/add-i-diff-filter' blob | commitdiff | raw
2018-03-14  Junio C HamanoMerge branch 'nd/worktree-move' blob | commitdiff | raw
2018-03-14  Junio C HamanoMerge branch 'pw/add-p-recount' blob | commitdiff | raw
2018-03-14  Junio C HamanoMerge branch 'ab/pre-auto-gc-battery' blob | commitdiff | raw
2018-03-14  Junio C HamanoMerge branch 'sg/test-x' blob | commitdiff | raw
2018-03-14  Junio C HamanoMerge branch 'rj/test-i18ngrep' blob | commitdiff | raw
2018-03-14  Junio C HamanoMerge branch 'ma/roll-back-lockfiles' blob | commitdiff | raw
2018-03-14  Junio C HamanoMerge branch 'nd/diff-stat-with-summary' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'ag/userdiff-go-funcname' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'ab/gc-auto-in-commit' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'bp/untracked-cache-noflush' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'rs/perf-repeat-thrice-by-default' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'mk/doc-pretty-fill' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'jc/test-must-be-empty' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'ds/mark-parents-uninteresting-optim' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'ds/find-unique-abbrev-optim' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'sg/subtree-signed-commits' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'rv/grep-cleanup' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'ot/ref-filter-cleanup' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'jh/status-no-ahead-behind' blob | commitdiff | raw
2018-03-08  Junio C HamanoMerge branch 'sg/travis-build-during-script-phase' blob | commitdiff | raw
2018-03-06  Junio C HamanoMerge branch 'bw/perl-timegm-timelocal-fix' blob | commitdiff | raw
2018-03-06  Junio C HamanoMerge branch 'jk/strbuf-read-file-close-error' blob | commitdiff | raw
2018-03-06  Junio C HamanoMerge branch 'bw/c-plus-plus' blob | commitdiff | raw
2018-03-06  Junio C HamanoMerge branch 'rs/strbuf-read-file-or-whine' blob | commitdiff | raw
2018-03-06  Junio C HamanoMerge branch 'ms/non-ascii-ticks' blob | commitdiff | raw
2018-03-06  Junio C HamanoMerge branch 'jk/test-helper-v-output-fix' blob | commitdiff | raw
2018-03-06  Junio C HamanoMerge branch 'jk/cached-commit-buffer' blob | commitdiff | raw
2018-03-06  Junio C HamanoMerge branch 'bw/doc-submodule-recurse-config-with... blob | commitdiff | raw
2018-03-06  Junio C HamanoMerge branch 'jc/allow-ff-merging-kept-tags' blob | commitdiff | raw
2018-03-06  Junio C HamanoMerge branch 'xz/send-email-batch-size' blob | commitdiff | raw | diff to current
2018-03-06  Junio C HamanoMerge branch 'sm/mv-dry-run-update' blob | commitdiff | raw | diff to current
2018-02-28  Junio C HamanoMerge branch 'tz/do-not-clean-spec-file' blob | commitdiff | raw | diff to current
2018-02-28  Junio C HamanoMerge branch 'gs/test-unset-xdg-cache-home' blob | commitdiff | raw | diff to current
2018-02-28  Junio C HamanoMerge branch 'tk/apply-dev-null-verify-name-fix' blob | commitdiff | raw | diff to current
2018-02-28  Junio C HamanoMerge branch 'sb/status-doc-fix' blob | commitdiff | raw | diff to current
2018-02-27  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion... blob | commitdiff | raw | diff to current
2018-02-27  Junio C HamanoMerge branch 'nd/ita-wt-renames-in-status' into maint blob | commitdiff | raw | diff to current
2018-02-27  Junio C HamanoMerge branch 'jk/sq-dequote-on-bogus-input' blob | commitdiff | raw | diff to current
2018-02-27  Junio C HamanoMerge branch 'bp/fsmonitor' blob | commitdiff | raw | diff to current
2018-02-27  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix' blob | commitdiff | raw | diff to current
2018-02-27  Junio C HamanoMerge branch 'sg/doc-test-must-fail-args' blob | commitdiff | raw | diff to current
2018-02-27  Junio C HamanoMerge branch 'rs/check-ignore-multi' blob | commitdiff | raw | diff to current
2018-02-27  Junio C HamanoMerge branch 'bp/name-hash-dirname-fix' blob | commitdiff | raw | diff to current
2018-02-16  Junio C Hamanomerge: allow fast-forward when merging a tracked tag blob | commitdiff | raw
2018-02-15  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix' into maint blob | commitdiff | raw | diff to current
2018-02-15  Junio C HamanoMerge branch 'jc/merge-symlink-ours-theirs' into maint blob | commitdiff | raw | diff to current
2018-02-15  Junio C HamanoMerge branch 'jm/svn-pushmergeinfo-fix' into maint blob | commitdiff | raw | diff to current
2018-02-15  Junio C HamanoMerge branch 'nd/ignore-glob-doc-update' blob | commitdiff | raw | diff to current
2018-02-15  Junio C HamanoMerge branch 'tg/reset-hard-show-head-with-pretty' blob | commitdiff | raw | diff to current
2018-02-15  Junio C HamanoMerge branch 'sb/pull-rebase-submodule' blob | commitdiff | raw | diff to current
2018-02-15  Junio C HamanoMerge branch 'jt/fsck-code-cleanup' blob | commitdiff | raw | diff to current
2018-02-13  Junio C HamanoMerge branch 'tz/doc-show-defaults-to-head' blob | commitdiff | raw | diff to current
2018-02-13  Junio C HamanoMerge branch 'jc/mailinfo-cleanup-fix' blob | commitdiff | raw | diff to current
2018-02-13  Junio C HamanoMerge branch 'rs/strbuf-cocci-workaround' blob | commitdiff | raw | diff to current
2018-02-13  Junio C HamanoMerge branch 'rb/hashmap-h-compilation-fix' blob | commitdiff | raw | diff to current
2018-02-13  Junio C HamanoMerge branch 'nd/diff-flush-before-warning' blob | commitdiff | raw | diff to current
2018-02-13  Junio C HamanoMerge branch 'cl/t9001-cleanup' blob | commitdiff | raw | diff to current
2018-02-13  Junio C HamanoMerge branch 'gs/retire-mru' blob | commitdiff | raw | diff to current
2018-02-13  Junio C HamanoMerge branch 'ot/mru-on-list' blob | commitdiff | raw | diff to current
2018-01-23  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix' blob | commitdiff | raw | diff to current
2018-01-23  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion... blob | commitdiff | raw | diff to current
2018-01-23  Junio C HamanoMerge branch 'cc/codespeed' blob | commitdiff | raw | diff to current
2018-01-23  Junio C HamanoMerge branch 'jc/merge-symlink-ours-theirs' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.