Andrew's git - gitweb.git/history - Documentation/merge-strategies.txt

[gitweb.git] / Documentation / merge-strategies.txt

2013-06-05	Merge branch 'jc/core-checkstat'	blob \| diff \| raw
2013-06-03	Merge branch 'kb/status-ignored-optim-2'	blob \| diff \| raw
2013-06-02	Merge branch 'tr/line-log'	blob \| diff \| raw
2013-06-02	Merge branch 'mk/combine-diff-context-horizon-fix'	blob \| diff \| raw
2013-06-02	Merge branch 'fc/macos-x-clipped-write'	blob \| diff \| raw
2013-06-02	Merge branch 'nd/clone-local-with-colon'	blob \| diff \| raw
2013-05-29	Merge branch 'jn/config-ignore-inaccessible'	blob \| diff \| raw
2013-05-29	Merge branch 'jk/lookup-object-prefer-latest'	blob \| diff \| raw
2013-05-29	Merge branch 'mh/packed-refs-various'	blob \| diff \| raw
2013-05-29	Merge branch 'as/check-ignore'	blob \| diff \| raw
2013-05-29	Merge branch 'jc/prune-all'	blob \| diff \| raw
2013-05-29	Merge branch 'js/transport-helper-error-reporting-fix'	blob \| diff \| raw
2013-05-29	Merge branch 'fc/transport-helper-error-reporting'	blob \| diff \| raw
2013-05-17	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw
2013-05-13	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw
2013-05-09	Merge branch 'mv/sequencer-pick-error-diag'	blob \| diff \| raw
2013-05-09	Merge branch 'tr/copy-revisions-from-stdin' into maint	blob \| diff \| raw
2013-05-07	Merge branch 'jk/merge-tree-added-identically'	blob \| diff \| raw
2013-05-03	Merge branch 'tr/unpack-entry-use-after-free-fix'	blob \| diff \| raw
2013-05-03	Merge branch 'tr/remote-tighten-commandline-parsing...	blob \| diff \| raw
2013-05-03	Merge branch 'jn/glossary-revision' into maint	blob \| diff \| raw
2013-05-01	Merge branch 'hb/git-pm-tempfile'	blob \| diff \| raw
2013-05-01	Merge branch 'rs/pp-user-info-without-extra-allocation'	blob \| diff \| raw
2013-05-01	Merge branch 'tr/remote-tighten-commandline-parsing'	blob \| diff \| raw
2013-05-01	Merge branch 'zk/prompt-rebase-step'	blob \| diff \| raw
2013-04-28	Merge branch 'jk/check-corrupt-objects-carefully'	blob \| diff \| raw
2013-04-28	Merge branch 'jk/merge-tree-added-identically'	blob \| diff \| raw
2013-04-26	Merge branch 'rr/shortlog-doc'	blob \| diff \| raw
2013-04-26	Merge branch 'ph/rebase-original'	blob \| diff \| raw
2013-04-26	Merge branch 'jn/glossary-revision'	blob \| diff \| raw
2013-04-26	Merge branch 'fc/remote-bzr'	blob \| diff \| raw
2013-04-26	Merge branch 'jk/a-thread-only-dies-once' into maint	blob \| diff \| raw
2013-04-26	Merge branch 'jn/gitweb-install-doc' into maint	blob \| diff \| raw
2013-04-26	Merge branch 'fc/untracked-zsh-prompt' into maint	blob \| diff \| raw
2013-04-26	Merge branch 'jk/receive-pack-deadlocks-with-early...	blob \| diff \| raw
2013-04-26	Merge branch 'jk/chopped-ident' into maint	blob \| diff \| raw
2013-04-26	Merge branch 'rt/commentchar-fmt-merge-msg' into maint	blob \| diff \| raw
2013-04-26	Merge branch 'rs/empty-archive' into maint	blob \| diff \| raw
2013-04-26	Merge branch 'pe/pull-rebase-v-q' into maint	blob \| diff \| raw
2013-04-24	Merge branch 'jk/remote-helper-with-signed-tags'	blob \| diff \| raw
2013-04-24	Merge branch 'jk/diff-algo-finishing-touches' into...	blob \| diff \| raw
2013-04-24	Merge git://github.com/git-l10n/git-po	blob \| diff \| raw
2013-04-23	Merge branch 'kb/status-ignored-optim-2'	blob \| diff \| raw
2013-04-23	Merge branch 'jn/gitweb-install-doc'	blob \| diff \| raw
2013-04-23	Merge branch 'fc/untracked-zsh-prompt'	blob \| diff \| raw
2013-04-23	Merge branch 'jk/receive-pack-deadlocks-with-early...	blob \| diff \| raw
2013-04-22	Sync with maint	blob \| diff \| raw
2013-04-22	Merge branch 'as/clone-reference-with-gitfile'	blob \| diff \| raw
2013-04-22	Merge branch 'jc/add-2.0-delete-default' (early part)	blob \| diff \| raw
2013-04-22	Merge branch 'nd/checkout-keep-sparse'	blob \| diff \| raw
2013-04-22	Merge branch 'jk/chopped-ident'	blob \| diff \| raw
2013-04-22	Merge branch 'th/bisect-final-log'	blob \| diff \| raw
2013-04-22	Merge branch 'rs/archive-zip-raw-compression'	blob \| diff \| raw
2013-04-22	Merge branch 'ta/glossary'	blob \| diff \| raw
2013-04-22	Merge branch 'jk/doc-http-backend'	blob \| diff \| raw
2013-04-22	Merge branch 'jx/i18n-branch-error-messages'	blob \| diff \| raw
2013-04-22	Merge branch 'fc/remote-hg'	blob \| diff \| raw
2013-04-22	Merge branch 'lf/read-blob-data-from-index'	blob \| diff \| raw
2013-04-19	Merge branch 'jk/a-thread-only-dies-once'	blob \| diff \| raw
2013-04-19	Merge branch 'rt/commentchar-fmt-merge-msg'	blob \| diff \| raw
2013-04-19	Merge branch 'mv/sequencer-pick-error-diag'	blob \| diff \| raw
2013-04-19	Merge branch 'tr/copy-revisions-from-stdin'	blob \| diff \| raw
2013-04-19	Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early...	blob \| diff \| raw
2013-04-19	Merge branch 'ap/strbuf-humanize'	blob \| diff \| raw
2013-04-19	Merge branch 'fc/branch-upstream-color'	blob \| diff \| raw
2013-04-19	Merge branch 'mv/ssl-ftp-curl'	blob \| diff \| raw
2013-04-18	Merge branch 'maint'	blob \| diff \| raw
2013-04-18	Merge branch 'jk/test-trash'	blob \| diff \| raw
2013-04-18	Merge branch 'th/t9903-symlinked-workdir'	blob \| diff \| raw
2013-04-18	Merge branch 'jk/merge-tree-added-identically'	blob \| diff \| raw
2013-04-18	Merge branch 'jk/http-dumb-namespaces'	blob \| diff \| raw
2013-04-18	Merge branch 'rs/empty-archive'	blob \| diff \| raw
2013-04-18	Merge branch 'fc/send-email-annotate'	blob \| diff \| raw
2013-04-18	Merge branch 'jc/push-2.0-default-to-simple' (early...	blob \| diff \| raw
2013-04-18	Merge branch 'jk/daemon-user-doc'	blob \| diff \| raw
2013-04-18	Merge branch 'fc/completion'	blob \| diff \| raw
2013-04-18	Merge branch 'kb/co-orphan-suggestion-short-sha1'	blob \| diff \| raw
2013-04-18	Merge branch 'jc/detached-head-doc'	blob \| diff \| raw
2013-04-18	Merge branch 'tr/packed-object-info-wo-recursion'	blob \| diff \| raw
2013-04-18	Merge branch 'jk/http-error-messages'	blob \| diff \| raw
2013-04-16	Merge branch 'maint'	blob \| diff \| raw
2013-04-15	Merge branch 'jk/diff-graph-submodule-summary'	blob \| diff \| raw
2013-04-15	Merge branch 'jk/diff-algo-finishing-touches'	blob \| diff \| raw
2013-04-05	git-merge(1): document diff-algorithm option to merge...	blob \| diff \| raw
2013-04-04	Merge branch 'jk/peel-ref' into maint	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jk/checkout-attribute-lookup' into maint...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'nd/index-pack-l10n-buf-overflow' into...	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'jk/checkout-attribute-lookup'	blob \| diff \| raw \| diff to current
2013-03-26	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| diff \| raw \| diff to current
2013-03-26	Merge branch 'nd/index-pack-l10n-buf-overflow' into...	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'jk/peel-ref'	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'ap/maint-diff-rename-avoid-overlap'	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'tk/doc-filter-branch' into maint-1.8.1	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'ob/imap-send-ssl-verify'	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'nd/index-pack-l10n-buf-overflow'	blob \| diff \| raw \| diff to current
2013-03-19	Merge branch 'tk/doc-filter-branch'	blob \| diff \| raw \| diff to current
next