projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
pull: make pull.ff=true override merge.ff
[git] / t / t7600-merge.sh
2015-04-28  Junio C HamanoMerge branch 'mh/multimail-renewal' blob | commitdiff | raw
2015-04-28  Junio C HamanoMerge branch 'mg/show-notes-doc' blob | commitdiff | raw
2015-04-28  Junio C HamanoMerge branch 'nd/versioncmp-prereleases' blob | commitdiff | raw
2015-04-28  Junio C HamanoMerge branch 'mg/status-v-v' blob | commitdiff | raw
2015-04-27  Junio C HamanoSync with 2.3.7 blob | commitdiff | raw
2015-04-21  Junio C HamanoSync with maint blob | commitdiff | raw
2015-04-21  Junio C HamanoMerge branch 'jz/gitweb-conf-doc-fix' into maint blob | commitdiff | raw | diff to current
2015-04-21  Junio C HamanoMerge branch 'jk/cherry-pick-docfix' into maint blob | commitdiff | raw | diff to current
2015-04-21  Junio C HamanoMerge branch 'iu/fix-parse-options-h-comment' into... blob | commitdiff | raw | diff to current
2015-04-21  Junio C HamanoMerge branch 'jn/doc-fast-import-no-16-octopus-limit... blob | commitdiff | raw | diff to current
2015-04-20  Junio C HamanoMerge branch 'ps/grep-help-all-callback-arg' blob | commitdiff | raw
2015-04-20  Junio C HamanoMerge branch 'tb/connect-ipv6-parse-fix' blob | commitdiff | raw
2015-04-20  Junio C HamanoMerge branch 'va/fix-git-p4-tests' blob | commitdiff | raw
2015-04-20  Junio C HamanoMerge branch 'jc/push-cert' blob | commitdiff | raw
2015-04-20  Junio C HamanoMerge branch 'ma/bash-completion-leaking-x' blob | commitdiff | raw
2015-04-19  Junio C HamanoMerge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'jk/colors' blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'jk/merge-quiet' blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'jk/pack-corruption-post-mortem' blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'jc/update-instead-into-void' blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'sb/plug-streaming-leak' blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'jn/doc-fast-import-no-16-octopus-limit' blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'sb/plug-wt-shortstatus-tracking-leak' blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'pt/enter-repo-comment-fix' blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'jz/gitweb-conf-doc-fix' blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'jk/cherry-pick-docfix' blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'iu/fix-parse-options-h-comment' blob | commitdiff | raw
2015-04-14  Junio C HamanoMerge branch 'jg/cguide-we-cannot-count' blob | commitdiff | raw
2015-04-02  Junio C HamanoMerge branch 'sb/atomic-push' blob | commitdiff | raw
2015-03-31  Junio C HamanoSync with 2.3.5 blob | commitdiff | raw
2015-03-28  Junio C HamanoSync with maint blob | commitdiff | raw
2015-03-28  Junio C HamanoMerge branch 'ph/push-doc-cas' blob | commitdiff | raw
2015-03-28  Junio C HamanoMerge branch 'ss/pull-rebase-preserve' blob | commitdiff | raw
2015-03-28  Junio C HamanoMerge branch 'jn/doc-api-errors' blob | commitdiff | raw
2015-03-27  Junio C HamanoSync with maint blob | commitdiff | raw
2015-03-27  Junio C HamanoMerge branch 'sb/leaks' blob | commitdiff | raw
2015-03-27  Jiang XinMerge branch 'maint' blob | commitdiff | raw
2015-03-27  Jiang XinMerge branch 'russian-l10n' of https://github.com/DJm00... blob | commitdiff | raw
2015-03-26  Junio C HamanoMerge branch 'jk/test-chain-lint' blob | commitdiff | raw
2015-03-24  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2015-03-23  Junio C HamanoMerge branch 'jc/decorate-leaky-separator-color' into... blob | commitdiff | raw | diff to current
2015-03-20  Junio C HamanoMerge branch 'jc/decorate-leaky-separator-color' blob | commitdiff | raw | diff to current
2015-03-20  Jeff Kingt: fix trivial &&-chain breakage blob | commitdiff | raw
2015-03-14  Junio C HamanoMerge branch 'jc/diff-test-updates' into maint blob | commitdiff | raw | diff to current
2015-03-14  Junio C HamanoMerge branch 'jc/apply-beyond-symlink' into maint blob | commitdiff | raw | diff to current
2015-03-10  Junio C HamanoMerge branch 'jc/decorate-leaky-separator-color' into... blob | commitdiff | raw | diff to current
2015-03-05  Junio C HamanoMerge branch 'sb/plug-leak-in-make-cache-entry' into... blob | commitdiff | raw | diff to current
2015-03-05  Junio C HamanoMerge branch 'es/blame-commit-info-fix' into maint blob | commitdiff | raw | diff to current
2015-03-05  Junio C HamanoMerge branch 'ab/merge-file-prefix' into maint blob | commitdiff | raw | diff to current
2015-03-05  Junio C HamanoMerge branch 'ps/submodule-sanitize-path-upon-add'... blob | commitdiff | raw | diff to current
2015-03-05  Junio C HamanoMerge branch 'jk/pack-bitmap' into maint blob | commitdiff | raw | diff to current
2015-03-05  Junio C HamanoMerge branch 'jk/decimal-width-for-uintmax' into maint blob | commitdiff | raw | diff to current
2015-03-05  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes... blob | commitdiff | raw | diff to current
2015-03-05  Junio C HamanoMerge branch 'jc/diff-test-updates' blob | commitdiff | raw | diff to current
2015-03-03  Junio C HamanoMerge branch 'jc/apply-beyond-symlink' blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'sb/plug-leak-in-make-cache-entry' blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'jc/send-email-sensible-encoding' blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes... blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'jc/max-io-size-and-ssize-max' blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'tc/missing-http-proxyauth' blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'jc/diff-format-doc' into maint blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot... blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'jk/status-read-branch-name-fix' into... blob | commitdiff | raw | diff to current
2015-02-22  Junio C HamanoMerge branch 'ps/submodule-sanitize-path-upon-add' blob | commitdiff | raw | diff to current
2015-02-22  Junio C HamanoMerge branch 'ab/merge-file-prefix' blob | commitdiff | raw | diff to current
2015-02-22  Junio C HamanoMerge branch 'es/blame-commit-info-fix' blob | commitdiff | raw | diff to current
2015-02-18  Junio C HamanoMerge branch 'jk/decimal-width-for-uintmax' blob | commitdiff | raw | diff to current
2015-02-18  Junio C HamanoMerge branch 'jk/pack-bitmap' blob | commitdiff | raw | diff to current
2015-02-17  Junio C HamanoMerge branch 'jk/status-read-branch-name-fix' blob | commitdiff | raw | diff to current
2015-02-17  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot... blob | commitdiff | raw | diff to current
2015-02-17  Junio C HamanoMerge branch 'jc/diff-format-doc' blob | commitdiff | raw | diff to current
2015-02-11  Junio C HamanoMerge branch 'jc/coding-guidelines' blob | commitdiff | raw | diff to current
2015-01-12  Junio C HamanoMerge branch 'mh/find-uniq-abbrev' into maint blob | commitdiff | raw | diff to current
2015-01-12  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into... blob | commitdiff | raw | diff to current
2015-01-12  Junio C HamanoMerge branch 'jk/for-each-reflog-ent-reverse' into... blob | commitdiff | raw | diff to current
2015-01-07  Junio C HamanoMerge branch 'maint-1.9' into maint-2.0 blob | commitdiff | raw | diff to current
2015-01-07  Junio C HamanoMerge branch 'sb/t5400-remove-unused' blob | commitdiff | raw | diff to current
2015-01-07  Junio C HamanoMerge branch 'pd/completion-filenames-fix' blob | commitdiff | raw | diff to current
2015-01-07  Junio C HamanoMerge branch 'jc/diff-b-m' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'jg/prompt-localize-temporary' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'jk/commit-date-approxidate' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'nd/split-index' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'js/test-hashmap-squelch-gcc' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'po/doc-assume-unchanged' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'jk/for-each-reflog-ent-reverse' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'sv/doc-stripspace' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'rj/t0050-passes' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'mh/find-uniq-abbrev' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'jc/refer-to-t-readme-from-submitting... blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'jk/push-simple' into maint blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'jk/checkout-from-tree' into maint blob | commitdiff | raw | diff to current
2014-12-17  Junio C HamanoSync with v1.9.5 blob | commitdiff | raw | diff to current
2014-12-12  Junio C HamanoMerge branch 'jk/pack-bitmap' blob | commitdiff | raw | diff to current
2014-12-12  Junio C HamanoMerge branch 'jk/push-simple' blob | commitdiff | raw | diff to current
2014-12-12  Junio C HamanoMerge branch 'rt/push-recurse-submodule-usage-string' blob | commitdiff | raw | diff to current
2014-12-12  Junio C HamanoMerge branch 'sv/typofix-apply-error-message' blob | commitdiff | raw | diff to current
2014-12-12  Junio C HamanoMerge branch 'jc/unpack-trees-plug-leak' blob | commitdiff | raw | diff to current
2014-12-05  Junio C HamanoMerge branch 'jk/checkout-from-tree' blob | commitdiff | raw | diff to current
2014-11-19  Junio C HamanoMerge branch 'sv/submitting-final-patch' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.