projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
[git] / t / t7600-merge.sh
2015-01-07  Junio C HamanoMerge branch 'maint-1.9' into maint-2.0 blob | commitdiff | raw
2014-12-17  Junio C HamanoSync with v1.9.5 blob | commitdiff | raw
2014-10-07  Junio C HamanoMerge branch 'maint-1.9' into maint-2.0 blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'ah/fix-http-push' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'po/error-message-style' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'zk/log-graph-showsig' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'mg/fix-log-mergetag-color' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'ye/doc-http-proto' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'jm/api-strbuf-doc' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'jm/dedup-test-config' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'sk/test-cmp-bin' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'jm/doc-wording-tweaks' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'jm/instaweb-apache-24' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'bg/xcalloc-nmemb-then-size' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'cb/byte-order' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'lt/request-pull' into maint blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'ep/shell-assign-and-export-vars' into... blob | commitdiff | raw
2014-07-22  Junio C HamanoMerge branch 'maint-1.9' into maint blob | commitdiff | raw
2014-07-16  Junio C HamanoMerge branch 'jc/fix-clone-single-starting-at-a-tag... blob | commitdiff | raw
2014-07-16  Junio C HamanoMerge branch 'jk/pretty-G-format-fixes' into maint blob | commitdiff | raw
2014-07-16  Junio C HamanoMerge branch 'rs/fix-alt-odb-path-comparison' into... blob | commitdiff | raw
2014-07-16  Junio C HamanoMerge branch 'jk/commit-buffer-length' into maint blob | commitdiff | raw
2014-07-16  Junio C HamanoMerge branch 'bc/fix-rebase-merge-skip' into maint blob | commitdiff | raw
2014-07-16  Junio C HamanoMerge branch 'maint-1.9' into maint blob | commitdiff | raw
2014-07-10  Junio C HamanoMerge branch 'pb/trim-trailing-spaces' into maint blob | commitdiff | raw
2014-07-10  Junio C HamanoMerge branch 'jk/repack-pack-keep-objects' into maint blob | commitdiff | raw
2014-07-10  Junio C HamanoMerge branch 'mc/doc-submodule-sync-recurse' into maint blob | commitdiff | raw
2014-07-02  Junio C HamanoMerge branch 'maint-1.8.5' into maint blob | commitdiff | raw
2014-06-25  Junio C HamanoMerge branch 'na/no-http-test-in-the-middle' into maint blob | commitdiff | raw
2014-06-25  Junio C HamanoMerge branch 'jl/status-added-submodule-is-never-ignore... blob | commitdiff | raw
2014-06-25  Junio C HamanoMerge branch 'ym/fix-opportunistic-index-update-race... blob | commitdiff | raw
2014-06-25  Junio C HamanoMerge branch 'mk/show-s-no-extra-blank-line-for-merges... blob | commitdiff | raw
2014-06-25  Junio C HamanoMerge branch 'rr/rebase-autostash-fix' into maint blob | commitdiff | raw | diff to current
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0' blob | commitdiff | raw | diff to current
2014-05-15  Max Kirillovgit-show: fix 'git show -s' to not add extra terminator... blob | commitdiff | raw
2014-04-09  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' into maint blob | commitdiff | raw | diff to current
2014-04-09  Junio C HamanoMerge commit 'doc/http-backend: missing accent grave... blob | commitdiff | raw | diff to current
2014-04-08  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' blob | commitdiff | raw | diff to current
2014-03-31  Junio C HamanoMerge branch 'wt/doc-submodule-name-path-confusion-1' blob | commitdiff | raw | diff to current
2014-03-18  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' into maint blob | commitdiff | raw | diff to current
2014-03-18  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' into... blob | commitdiff | raw | diff to current
2014-03-18  Junio C HamanoMerge branch 'jk/config-path-include-fix' into maint blob | commitdiff | raw | diff to current
2014-03-18  Junio C HamanoMerge branch 'nd/sha1-file-delta-stack-leakage-fix' blob | commitdiff | raw | diff to current
2014-03-14  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' blob | commitdiff | raw | diff to current
2014-03-14  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' blob | commitdiff | raw | diff to current
2014-03-07  Junio C HamanoMerge branch 'jc/hold-diff-remove-q-synonym-for-no... blob | commitdiff | raw | diff to current
2014-03-07  Junio C HamanoMerge branch 'jc/core-checkstat-2.0' blob | commitdiff | raw | diff to current
2014-03-07  Junio C HamanoMerge branch 'jc/add-2.0-ignore-removal' blob | commitdiff | raw | diff to current
2014-03-07  Junio C HamanoMerge branch 'jn/add-2.0-u-A-sans-pathspec' blob | commitdiff | raw | diff to current
2014-03-07  Junio C HamanoMerge branch 'jc/push-2.0-default-to-simple' blob | commitdiff | raw | diff to current
2014-02-27  Junio C HamanoMerge branch 'bs/stdio-undef-before-redef' blob | commitdiff | raw | diff to current
2014-02-27  Junio C HamanoMerge branch 'jk/config-path-include-fix' blob | commitdiff | raw | diff to current
2014-02-13  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint blob | commitdiff | raw | diff to current
2014-02-05  Junio C HamanoMerge branch 'jc/maint-pull-docfix' into maint blob | commitdiff | raw | diff to current
2014-01-27  Junio C HamanoMerge branch 'jc/revision-range-unpeel' blob | commitdiff | raw | diff to current
2014-01-27  Junio C HamanoMerge branch 'mh/attr-macro-doc' blob | commitdiff | raw | diff to current
2014-01-27  Junio C HamanoMerge branch 'jc/maint-pull-docfix' blob | commitdiff | raw | diff to current
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui blob | commitdiff | raw | diff to current
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into... blob | commitdiff | raw | diff to current
2014-01-13  Junio C HamanoMerge branch 'jk/t5531-prepare-to-default-to-non-matching' blob | commitdiff | raw | diff to current
2013-12-17  Junio C HamanoMerge branch 'rs/doc-submitting-patches' into maint blob | commitdiff | raw | diff to current
2013-12-17  Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix' into... blob | commitdiff | raw | diff to current
2013-12-17  Junio C HamanoMerge branch 'nd/magic-pathspec' into maint blob | commitdiff | raw | diff to current
2013-12-12  Junio C HamanoMerge branch 'rs/doc-submitting-patches' blob | commitdiff | raw | diff to current
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2013-12-09  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2013-12-06  Junio C HamanoMerge branch 'nd/magic-pathspec' blob | commitdiff | raw | diff to current
2013-12-05  Junio C HamanoMerge branch 'jn/mediawiki-makefile-updates' blob | commitdiff | raw | diff to current
2013-12-05  Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix' blob | commitdiff | raw | diff to current
2013-12-05  Junio C HamanoMerge branch 'jk/replace-perl-in-built-scripts' blob | commitdiff | raw | diff to current
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint blob | commitdiff | raw | diff to current
2013-11-07  Junio C HamanoMerge branch 'hn/log-graph-color-octopus' into maint blob | commitdiff | raw | diff to current
2013-11-07  Junio C HamanoMerge branch 'mm/checkout-auto-track-fix' into maint blob | commitdiff | raw | diff to current
2013-11-07  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint blob | commitdiff | raw | diff to current
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects' blob | commitdiff | raw | diff to current
2013-11-04  Junio C HamanoMerge branch 'jk/duplicate-objects-in-packs' blob | commitdiff | raw | diff to current
2013-11-04  Junio C HamanoMerge branch 'ak/cvsserver-stabilize-use-of-hash-keys' blob | commitdiff | raw | diff to current
2013-11-01  Junio C HamanoMerge branch 'rs/web-browse-xdg-open' blob | commitdiff | raw | diff to current
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc' blob | commitdiff | raw | diff to current
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon' blob | commitdiff | raw | diff to current
2013-10-30  Junio C HamanoMerge branch 'nd/magic-pathspec' blob | commitdiff | raw | diff to current
2013-10-30  Junio C HamanoMerge branch 'nd/gc-lock-against-each-other' blob | commitdiff | raw | diff to current
2013-10-30  Junio C HamanoMerge branch 'hn/log-graph-color-octopus' blob | commitdiff | raw | diff to current
2013-10-30  Junio C HamanoMerge branch 'mm/checkout-auto-track-fix' blob | commitdiff | raw | diff to current
2013-10-30  Junio C HamanoMerge branch 'sg/t3600-nul-sha1-fix' blob | commitdiff | raw | diff to current
2013-10-28  Junio C HamanoMerge branch 'ew/keepalive' blob | commitdiff | raw | diff to current
2013-10-28  Junio C HamanoMerge branch 'jc/revision-range-unpeel' blob | commitdiff | raw | diff to current
2013-10-28  Junio C HamanoMerge branch 'jx/relative-path-regression-fix' blob | commitdiff | raw | diff to current
2013-10-28  Junio C HamanoMerge branch 'jk/format-patch-from' into maint blob | commitdiff | raw | diff to current
2013-10-28  Junio C HamanoMerge branch 'jk/shortlog-tolerate-broken-commit' into... blob | commitdiff | raw | diff to current
2013-10-28  Junio C HamanoMerge branch 'jk/diff-algo' into maint blob | commitdiff | raw | diff to current
2013-10-23  Junio C HamanoMerge branch 'jc/ls-files-killed-optim' into maint blob | commitdiff | raw | diff to current
2013-10-23  Junio C HamanoMerge branch 'jh/checkout-auto-tracking' into maint blob | commitdiff | raw | diff to current
2013-10-23  Junio C HamanoMerge branch 'hu/cherry-pick-previous-branch' blob | commitdiff | raw | diff to current
2013-10-23  Junio C HamanoMerge branch 'mg/more-textconv' blob | commitdiff | raw | diff to current
2013-10-23  Junio C HamanoMerge branch 'jc/pack-objects' blob | commitdiff | raw | diff to current
2013-10-18  Junio C HamanoMerge branch 'jc/reflog-doc' blob | commitdiff | raw | diff to current
2013-10-17  Junio C HamanoMerge branch 'jk/format-patch-from' blob | commitdiff | raw | diff to current
2013-10-17  Junio C HamanoMerge branch 'jk/upload-pack-keepalive' into maint blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.