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

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

2011-05-17	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...	blob \| diff \| raw
2011-05-16	Merge branch 'jc/fix-add-u-unmerged' into maint	blob \| diff \| raw \| diff to current
2011-05-16	Merge branch 'jc/maint-branch-mergeoptions' into maint	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'jc/fix-add-u-unmerged'	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'jk/merge-one-file-working-tree' into...	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'jc/fix-diff-files-unmerged' into maint	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'mz/maint-rename-unmerged' into maint	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jc/maint-branch-mergeoptions'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'jc/maint-branch-mergeoptions' into mg...	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'im/hashcmp-optim'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'jk/merge-one-file-working-tree'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'jc/fix-diff-files-unmerged'	blob \| diff \| raw \| diff to current
2011-05-05	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...	blob \| diff \| raw
2011-05-04	Merge branch 'sp/maint-clear-postfields' into maint	blob \| diff \| raw \| diff to current
2011-05-02	Merge branch 'mz/maint-rename-unmerged'	blob \| diff \| raw \| diff to current
2011-04-29	Merge branch 'mg/x-years-12-months' into maint	blob \| diff \| raw \| diff to current
2011-04-28	Merge branch 'en/merge-recursive'	blob \| diff \| raw \| diff to current
2011-04-28	Merge branch 'sp/maint-clear-postfields'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'mg/x-years-12-months'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'ef/maint-strbuf-init'	blob \| diff \| raw \| diff to current
2011-04-25	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...	blob \| diff \| raw
2011-04-11	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2011-04-03	Merge branch 'jc/index-update-if-able' into maint	blob \| diff \| raw \| diff to current
2011-04-03	Merge branch 'jc/maint-rev-list-culled-boundary' into...	blob \| diff \| raw \| diff to current
2011-04-01	Merge branch 'nd/index-doc' into maint	blob \| diff \| raw \| diff to current
2011-04-01	Merge branch 'jc/maint-diff-q-filter' into maint	blob \| diff \| raw \| diff to current
2011-04-01	Merge branch 'mg/doc-bisect-tweak-worktree' into maint	blob \| diff \| raw \| diff to current
2011-04-01	Merge branch 'jh/maint-do-not-track-non-branches' into...	blob \| diff \| raw \| diff to current
2011-04-01	Merge "checkout ambiguous ref bugfix" into maint	blob \| diff \| raw \| diff to current
2011-03-27	Merge branch 'jc/index-update-if-able'	blob \| diff \| raw \| diff to current
2011-03-27	Merge branch 'jc/maint-rerere-in-workdir'	blob \| diff \| raw \| diff to current
2011-03-27	Merge branch 'nd/index-doc'	blob \| diff \| raw \| diff to current
2011-03-26	Merge git-gui 0.14.0	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'jc/maint-diff-q-filter'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'mg/doc-bisect-tweak-worktree'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'jc/maint-rev-list-culled-boundary'	blob \| diff \| raw \| diff to current
2011-03-16	Merge branch 'jn/maint-commit-missing-template' into...	blob \| diff \| raw \| diff to current
2011-03-16	Merge branch 'jk/diffstat-binary' into maint	blob \| diff \| raw \| diff to current
2011-03-16	Merge branch 'jn/test-terminal-punt-on-osx-breakage...	blob \| diff \| raw \| diff to current
2011-03-15	Merge branch 'jh/maint-do-not-track-non-branches'	blob \| diff \| raw \| diff to current
2011-03-14	Merge branch 'sp/maint-smart-http-sans-100-continue'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'jn/maint-commit-missing-template'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'jk/diffstat-binary'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'jn/test-terminal-punt-on-osx-breakage'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'uk/checkout-ambiguous-ref'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'sp/maint-smart-http-sans-100-continue'	blob \| diff \| raw \| diff to current
2011-02-16	Merge branch 'maint-1.7.3' into maint	blob \| diff \| raw \| diff to current
2011-02-16	Merge branch 'maint-1.7.2' into maint-1.7.3	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'tr/merge-unborn-clobber'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'jn/unpack-lstat-failure-report'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'maint-1.7.0' into maint	blob \| diff \| raw \| diff to current
2011-01-31	Merge branch 'jl/fetch-submodule-recursive' into maint	blob \| diff \| raw \| diff to current
2011-01-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-01-27	Merge branch 'jn/fast-import-empty-tree-removal' into...	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'jk/diff-driver-binary-doc' into maint	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'tr/submodule-relative-scp-url' into maint	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'jn/maint-fast-import-object-reuse' into...	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'jn/submodule-b-current' into maint	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'jc/maint-svn-info-test-fix' into maint	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'nd/maint-relative' into maint	blob \| diff \| raw \| diff to current
2011-01-13	Merge branch 'jn/gitweb-no-logo'	blob \| diff \| raw \| diff to current
2011-01-13	Merge branch 'jk/diff-driver-binary-doc'	blob \| diff \| raw \| diff to current
2011-01-13	Merge branch 'tr/submodule-relative-scp-url'	blob \| diff \| raw \| diff to current
2011-01-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-01-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-01-10	Merge branch 'maint-1.7.2' into maint	blob \| diff \| raw \| diff to current
2011-01-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-01-05	Merge branch 'maint' to sync with 1.7.3.5	blob \| diff \| raw \| diff to current
2011-01-05	Merge branch 'mg/cvsimport'	blob \| diff \| raw \| diff to current
2011-01-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-28	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-28	Merge branch 'jc/maint-rebase-rewrite-last-skip'	blob \| diff \| raw \| diff to current
2010-12-26	Merge branch 'rs/maint-diff-fd-leak' into maint	blob \| diff \| raw \| diff to current
2010-12-23	Merge branch 'rj/maint-difftool-cygwin-workaround'	blob \| diff \| raw \| diff to current
2010-12-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-22	Merge branch 'rj/maint-test-fixes'	blob \| diff \| raw \| diff to current
2010-12-22	Merge branch 'jc/maint-am-abort-safely'	blob \| diff \| raw \| diff to current
2010-12-22	Merge branch 'jk/commit-die-on-bogus-ident'	blob \| diff \| raw \| diff to current
2010-12-22	Merge branch 'nd/maint-fix-add-typo-detection'	blob \| diff \| raw \| diff to current
2010-12-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-21	Merge branch 'ks/blame-worktree-textconv-cached'	blob \| diff \| raw \| diff to current
2010-12-21	Merge branch 'jk/maint-decorate-01-bool'	blob \| diff \| raw \| diff to current
2010-12-21	Merge branch 'jn/maint-gitweb-pathinfo-fix'	blob \| diff \| raw \| diff to current
2010-12-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-16	Merge branch 'jl/fetch-submodule-recursive'	blob \| diff \| raw \| diff to current
2010-12-16	Merge branch 'nd/extended-sha1-relpath'	blob \| diff \| raw \| diff to current
2010-12-16	Merge branch 'ak/describe-exact'	blob \| diff \| raw \| diff to current
2010-12-16	Merge branch 'nd/maint-relative'	blob \| diff \| raw \| diff to current
2010-12-16	Merge branch 'jn/maint-svn-fe'	blob \| diff \| raw \| diff to current
2010-12-16	Merge branch 'jc/maint-svn-info-test-fix'	blob \| diff \| raw \| diff to current
2010-12-16	Merge branch 'jn/submodule-b-current'	blob \| diff \| raw \| diff to current
2010-12-16	Merge branch 'jn/maint-fast-import-object-reuse'	blob \| diff \| raw \| diff to current
2010-12-16	Sync with 1.7.3.4	blob \| diff \| raw \| diff to current
2010-12-15	Git 1.7.3.4 v1.7.3.4	blob \| diff \| raw \| diff to current
next