projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'hi/gpg-optional-pkfp-fix'
[git] / Documentation / merge-strategies.txt
2019-12-05  Junio C HamanoMerge branch 'hi/gpg-optional-pkfp-fix' blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'pw/sequencer-compare-with-right-parent... blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'jk/fail-show-toplevel-outside-working... blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'sg/unpack-progress-throughput' blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'pb/submodule-update-fetches' blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'jc/azure-ci-osx-fix-fix' blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'dl/range-diff-with-notes' blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'jh/userdiff-python-async' blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'ec/fetch-mark-common-refs-trace2' blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'dd/rebase-merge-reserves-onto-label' blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'js/builtin-add-i' blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'js/rebase-r-safer-label' blob | commitdiff | raw
2019-12-05  Junio C HamanoMerge branch 'ep/guard-kset-tar-headers' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'jk/gitweb-anti-xss' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'ar/install-doc-update-cmds-needing-the... blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'ma/t7004' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'js/complete-svn-recursive' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'jk/send-pack-remote-failure' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'jc/fsmonitor-sanity-fix' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'sg/skip-skipped-prereq' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'ds/test-read-graph' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'rs/use-copy-array-in-mingw-shell-command... blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'rs/parse-options-dup-null-fix' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'jt/fetch-remove-lazy-fetch-plugging' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'jk/optim-in-pack-idx-conversion' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'dl/complete-rebase-onto' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'tg/stash-refresh-index' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'nn/doc-rebase-merges' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'dd/sequencer-utf8' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'jk/remove-sha1-to-hex' blob | commitdiff | raw
2019-12-01  Junio C HamanoMerge branch 'dj/typofix-merge-strat' blob | commitdiff | raw
2019-11-11  Dominic Jägermerge-strategies: fix typo "reflected to" to "reflected in" blob | commitdiff | raw
2019-11-04  Junio C HamanoMerge https://github.com/prati0100/git-gui blob | commitdiff | raw | diff to current
2019-09-18  Junio C HamanoMerge branch 'master' of https://github.com/prati0100... blob | commitdiff | raw | diff to current
2019-09-17  Junio C HamanoMerge gitk to pick up emergency build fix blob | commitdiff | raw | diff to current
2019-09-16  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2019-08-07  Junio C HamanoMerge branch 'py/call-do-quit-before-exit' of github... blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'pw/add-p-recount' into maint blob | commitdiff | raw | diff to current
2019-07-09  Junio C HamanoMerge branch 'pw/add-p-recount' blob | commitdiff | raw | diff to current
2019-03-18  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2019-03-11  Junio C HamanoMerge branch 'js/rebase-recreate-merge' blob | commitdiff | raw | diff to current
2019-02-14  Junio C HamanoMerge branch 'jc/no-grepping-for-strerror-in-tests' blob | commitdiff | raw | diff to current
2019-02-05  Junio C HamanoMerge branch 'cc/test-ref-store-typofix' blob | commitdiff | raw | diff to current
2019-01-29  Junio C HamanoMerge branch 'cc/partial-clone-doc-typofix' blob | commitdiff | raw | diff to current
2019-01-14  Junio C HamanoMerge branch 'md/exclude-promisor-objects-fix-cleanup' blob | commitdiff | raw | diff to current
2019-01-14  Junio C HamanoMerge branch 'hb/t0061-dot-in-path-fix' blob | commitdiff | raw | diff to current
2019-01-03  Junio C HamanoMerge branch 'sg/test-bash-version-fix' blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'tb/char-may-be-unsigned' into maint blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'nd/packobjectshook-doc-fix' into maint blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'jk/check-everything-connected-is-long... blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'tq/refs-internal-comment-fix' into maint blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'bw/protocol-v2' into maint blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'sg/t3701-tighten-trace' into maint blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'ts/doc-build-manpage-xsl-quietly' into... blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'md/exclude-promisor-objects-fix' into... blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'js/diff-notice-has-drive-prefix' into... blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'np/log-graph-octopus-fix' into maint blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'sm/show-superproject-while-conflicted... blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'nd/attr-pathspec-fix' into maint blob | commitdiff | raw | diff to current
2018-11-21  Junio C HamanoMerge branch 'en/rerere-multi-stage-1-fix' into maint blob | commitdiff | raw | diff to current
2018-11-13  Junio C HamanoMerge branch 'ag/rev-parse-all-exclude-fix' blob | commitdiff | raw | diff to current
2018-11-06  Junio C HamanoMerge branch 'tb/char-may-be-unsigned' blob | commitdiff | raw | diff to current
2018-11-06  Junio C HamanoMerge branch 'md/exclude-promisor-objects-fix' blob | commitdiff | raw | diff to current
2018-11-06  Junio C HamanoMerge branch 'nd/completion-negation' blob | commitdiff | raw | diff to current
2018-10-31  Junio C HamanoAdjust for 2.19.x series blob | commitdiff | raw | diff to current
2018-10-30  Junio C HamanoMerge branch 'js/diff-notice-has-drive-prefix' blob | commitdiff | raw | diff to current
2018-10-26  Junio C HamanoMerge branch 'np/log-graph-octopus-fix' blob | commitdiff | raw | diff to current
2018-10-25  Junio C Hamanot0061: adjust to test-tool transition blob | commitdiff | raw | diff to current
2018-10-19  Junio C HamanoMerge branch 'sm/show-superproject-while-conflicted' blob | commitdiff | raw | diff to current
2018-10-16  Junio C HamanoMerge branch 'nd/packobjectshook-doc-fix' blob | commitdiff | raw | diff to current
2018-10-16  Junio C HamanoMerge branch 'jk/check-everything-connected-is-long... blob | commitdiff | raw | diff to current
2018-10-16  Junio C HamanoMerge branch 'tq/refs-internal-comment-fix' blob | commitdiff | raw | diff to current
2018-09-27  Junio C HamanoSync with 2.17.2 blob | commitdiff | raw | diff to current
2018-09-27  Junio C HamanoSync with 2.16.5 blob | commitdiff | raw | diff to current
2018-09-27  Junio C HamanoSync with 2.15.3 blob | commitdiff | raw | diff to current
2018-09-24  Junio C HamanoMerge branch 'nd/attr-pathspec-fix' blob | commitdiff | raw | diff to current
2018-09-24  Junio C HamanoMerge branch 'bw/protocol-v2' blob | commitdiff | raw | diff to current
2018-09-24  Junio C HamanoMerge branch 'sg/t3701-tighten-trace' blob | commitdiff | raw | diff to current
2018-09-24  Junio C HamanoMerge branch 'sb/diff-color-move-more' blob | commitdiff | raw | diff to current
2018-09-24  Junio C HamanoMerge branch 'en/rerere-multi-stage-1-fix' blob | commitdiff | raw | diff to current
2018-09-17  Junio C HamanoMerge branch 'ts/doc-build-manpage-xsl-quietly' blob | commitdiff | raw | diff to current
2018-09-04  Junio C HamanoMerge branch 'ds/commit-graph-lockfile-fix' blob | commitdiff | raw | diff to current
2018-08-27  Junio C HamanoMerge branch 'sg/t7501-thinkofix' blob | commitdiff | raw | diff to current
2018-08-27  Junio C HamanoMerge branch 'sg/t0020-conversion-fix' blob | commitdiff | raw | diff to current
2018-08-27  Junio C HamanoMerge branch 'sg/t4051-fix' blob | commitdiff | raw | diff to current
2018-08-27  Junio C HamanoMerge branch 'js/larger-timestamps' blob | commitdiff | raw | diff to current
2018-08-22  Junio C HamanoMerge branch 'nd/pack-deltify-regression-fix' blob | commitdiff | raw | diff to current
2018-08-20  Junio C HamanoMerge branch 'nd/cherry-pick-quit-fix' blob | commitdiff | raw | diff to current
2018-08-20  Junio C HamanoMerge branch 'pw/rebase-i-squash-number-fix' blob | commitdiff | raw | diff to current
2018-08-20  Junio C HamanoMerge branch 'sb/config-write-fix' blob | commitdiff | raw | diff to current
2018-08-20  Junio C HamanoMerge branch 'jh/partial-clone-doc' blob | commitdiff | raw | diff to current
2018-08-20  Junio C HamanoMerge branch 'sb/pull-rebase-submodule' blob | commitdiff | raw | diff to current
2018-08-20  Junio C HamanoMerge branch 'js/typofixes' blob | commitdiff | raw | diff to current
2018-08-17  Junio C HamanoMerge branch 'nd/complete-config-vars' blob | commitdiff | raw | diff to current
2018-08-17  Junio C HamanoMerge branch 'ar/t4150-am-scissors-test-fix' blob | commitdiff | raw | diff to current
2018-08-17  Junio C HamanoMerge branch 'en/t3031-title-fix' blob | commitdiff | raw | diff to current
2018-08-17  Junio C HamanoMerge branch 'rs/parse-opt-lithelp' blob | commitdiff | raw | diff to current
2018-08-17  Junio C HamanoMerge branch 'jt/refspec-dwim-precedence-fix' blob | commitdiff | raw | diff to current
2018-08-17  Junio C HamanoMerge branch 'jk/merge-subtree-heuristics' blob | commitdiff | raw | diff to current
2018-08-15  Junio C HamanoMerge branch 'sb/histogram-less-memory' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.