git.oblomov.eu Git - git/history - Documentation/merge-strategies.txt

[git] / Documentation / merge-strategies.txt

2012-03-24	Junio C Hamano	Merge gitk changes from Paul Mackerras at git://ozlabs...	blob \| commitdiff \| raw
2012-03-16	Junio C Hamano	Merge branch 'th/doc-diff-submodule-option'	blob \| commitdiff \| raw
2012-02-27	Junio C Hamano	Merge branch 'pj/remote-set-branches-usage-fix' into...	blob \| commitdiff \| raw
2012-02-23	Junio C Hamano	Merge branch 'pj/remote-set-branches-usage-fix'	blob \| commitdiff \| raw
2012-02-16	Junio C Hamano	Merge branch 'mm/empty-loose-error-message' into maint	blob \| commitdiff \| raw
2012-02-13	Junio C Hamano	Merge branch 'mm/empty-loose-error-message'	blob \| commitdiff \| raw
2011-12-28	Junio C Hamano	Merge branch 'jk/maint-strbuf-missing-init' into maint	blob \| commitdiff \| raw
2011-12-22	Junio C Hamano	Merge branch 'jk/maint-strbuf-missing-init'	blob \| commitdiff \| raw
2011-12-21	Junio C Hamano	Merge branch 'jl/submodule-status-failure-report' into...	blob \| commitdiff \| raw
2011-12-21	Junio C Hamano	Merge branch 'tr/userdiff-c-returns-pointer' into maint	blob \| commitdiff \| raw
2011-12-21	Junio C Hamano	Merge branch 'ms/commit-cc-option-helpstring' into...	blob \| commitdiff \| raw
2011-12-18	Junio C Hamano	Update jk/maint-strbuf-missing-init to builtin/ rename	blob \| commitdiff \| raw \| diff to current
2011-12-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'jl/submodule-status-failure-report'	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'tr/userdiff-c-returns-pointer'	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'jc/maint-name-rev-all' into maint-1.7.6	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'ml/mailmap' into maint-1.7.6	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2011-12-05	Junio C Hamano	Merge branch 'nd/maint-ignore-exclude'	blob \| commitdiff \| raw
2011-11-28	Junio C Hamano	Merge branch 'nd/maint-ignore-exclude' into nd/ignore...	blob \| commitdiff \| raw
2011-11-23	Junio C Hamano	Merge branch 'maint' into tj/imap-send-remove-unused	blob \| commitdiff \| raw
2011-11-21	Junio C Hamano	Merge branch 'jk/maint-1.6.2-upload-archive' into jk...	blob \| commitdiff \| raw
2011-11-18	Junio C Hamano	Merge branch 'jc/maint-name-rev-all' into maint	blob \| commitdiff \| raw
2011-11-18	Junio C Hamano	Merge branch 'ml/mailmap' into maint	blob \| commitdiff \| raw
2011-11-12	Junio C Hamano	Merge branch 'ly/mktree-using-strbuf'	blob \| commitdiff \| raw
2011-11-10	Junio C Hamano	Merge "Move 'builtin-*' into a 'builtin/' subdirectory"	blob \| commitdiff \| raw \| diff to current
2011-11-10	Junio C Hamano	Merge 'build-in git-mktree'	blob \| commitdiff \| raw \| diff to current
2011-11-09	Junio C Hamano	Merge branch 'jc/remote-setbranches-usage-fix'	blob \| commitdiff \| raw
2011-11-09	Junio C Hamano	Merge branch 'fc/remote-seturl-usage-fix'	blob \| commitdiff \| raw
2011-11-09	Junio C Hamano	Merge branch 'jc/maint-remove-renamed-ref' into maint	blob \| commitdiff \| raw
2011-11-08	Junio C Hamano	Merge branch 'ss/blame-textconv-fake-working-tree'	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge branch 'md/smtp-tls-hello-again' into maint	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge branch 'jc/maint-diffstat-numstat-context' into...	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge branch 'ss/blame-textconv-fake-working-tree'	blob \| commitdiff \| raw
2011-10-26	Junio C Hamano	Merge branch 'maint-1.7.3' into maint-1.7.4	blob \| commitdiff \| raw
2011-10-26	Junio C Hamano	Merge branch 'sn/doc-update-index-assume-unchanged...	blob \| commitdiff \| raw \| diff to current
2011-10-24	Junio C Hamano	Merge branch 'maint-1.7.3' into maint	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'jc/maint-remove-renamed-ref'	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'cn/doc-config-bare-subsection'	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'jc/apply-blank-at-eof-fix' into maint	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'js/maint-merge-one-file-osx-expr' into...	blob \| commitdiff \| raw
2011-10-19	Junio C Hamano	Merge branch 'js/log-show-children'	blob \| commitdiff \| raw
2011-10-19	Junio C Hamano	Merge branch 'cb/httpd-test-fix-port'	blob \| commitdiff \| raw
2011-10-19	Junio C Hamano	Merge branch 'md/smtp-tls-hello-again'	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'bk/ancestry-path' into maint	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'nm/grep-object-sha1-lock' into maint	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'jc/maint-grep-untracked-exclude' into...	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'js/maint-merge-one-file-osx-expr'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'jc/apply-blank-at-eof-fix'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'bw/grep-no-index-no-exclude'	blob \| commitdiff \| raw
2011-10-10	Junio C Hamano	Merge branch 'jc/maint-diffstat-numstat-context'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'jc/ls-remote-short-help'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'sn/doc-update-index-assume-unchanged'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'rj/quietly-create-dep-dir'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'jc/fetch-pack-fsck-objects'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'gb/am-hg-patch'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'bk/ancestry-path'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'nm/grep-object-sha1-lock'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'jc/maint-grep-untracked-exclude' into...	blob \| commitdiff \| raw
2011-09-23	Junio C Hamano	Merge branch 'gb/maint-am-patch-format-error-message...	blob \| commitdiff \| raw
2011-09-22	Junio C Hamano	Merge branch 'bk/ancestry-path' into jc/branch-desc	blob \| commitdiff \| raw
2011-09-12	Junio C Hamano	Merge branch 'jk/tag-contains-ab' (early part) into...	blob \| commitdiff \| raw
2011-09-12	Junio C Hamano	Merge branch 'jk/maint-1.7.2-status-ignored' into maint	blob \| commitdiff \| raw
2011-09-02	Junio C Hamano	Merge branch 'tr/maint-t3903-misquoted-command'	blob \| commitdiff \| raw
2011-09-02	Junio C Hamano	Merge branch 'gb/maint-am-stgit-author-to-from-fix'	blob \| commitdiff \| raw
2011-09-02	Junio C Hamano	Merge branch 'gb/maint-am-patch-format-error-message'	blob \| commitdiff \| raw
2011-09-02	Junio C Hamano	Merge branch 'bg/t5540-osx-grep'	blob \| commitdiff \| raw
2011-08-25	Junio C Hamano	Merge branch 'jn/plug-empty-tree-leak'	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'jc/maint-combined-diff-work-tree' into...	blob \| commitdiff \| raw
2011-08-18	Junio C Hamano	Merge branch 'jc/maint-combined-diff-work-tree'	blob \| commitdiff \| raw
2011-08-16	Junio C Hamano	Merge branch 'jk/fast-export-quote-path' into maint	blob \| commitdiff \| raw
2011-08-16	Junio C Hamano	Merge branch 'bw/log-all-ref-updates-doc' into maint	blob \| commitdiff \| raw
2011-08-16	Junio C Hamano	Merge branch 'js/maint-add-path-stat-pwd' into maint	blob \| commitdiff \| raw
2011-08-16	Junio C Hamano	Merge branch 'jn/mime-type-with-params' into maint	blob \| commitdiff \| raw
2011-08-16	Junio C Hamano	Merge branch 'jc/submodule-sync-no-auto-vivify' into...	blob \| commitdiff \| raw
2011-08-16	Junio C Hamano	Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...	blob \| commitdiff \| raw
2011-08-11	Junio C Hamano	Merge branch 'jk/fast-export-quote-path'	blob \| commitdiff \| raw
2011-08-01	Junio C Hamano	Merge branch 'jc/legacy-loose-object' into maint	blob \| commitdiff \| raw
2011-08-01	Junio C Hamano	Merge branch 'jc/maint-1.7.3-checkout-describe' into...	blob \| commitdiff \| raw
2011-07-22	Junio C Hamano	Merge branch 'jk/tag-contains-ab'	blob \| commitdiff \| raw
2011-07-22	Junio C Hamano	Merge branch 'bw/log-all-ref-updates-doc'	blob \| commitdiff \| raw
2011-07-22	Junio C Hamano	Merge branch 'js/maint-add-path-stat-pwd'	blob \| commitdiff \| raw
2011-07-19	Junio C Hamano	Merge branch 'jn/mime-type-with-params'	blob \| commitdiff \| raw
2011-07-19	Junio C Hamano	Merge branch 'jc/submodule-sync-no-auto-vivify'	blob \| commitdiff \| raw
2011-07-13	Junio C Hamano	Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'	blob \| commitdiff \| raw
2011-07-13	Junio C Hamano	Merge branch 'jc/legacy-loose-object'	blob \| commitdiff \| raw
2011-07-06	Junio C Hamano	Merge commit 'v1.7.6' into jc/checkout-reflog-fix	blob \| commitdiff \| raw
2011-07-06	Junio C Hamano	Merge commit 'v1.7.0' into jc/checkout-reflog-fix	blob \| commitdiff \| raw \| diff to current
2011-07-06	Junio C Hamano	Merge commit 'v1.6.0' into jc/checkout-reflog-fix	blob \| commitdiff \| raw \| diff to current
2011-06-30	Junio C Hamano	Merge branch 'jc/maint-1.7.3-checkout-describe'	blob \| commitdiff \| raw
2011-06-30	Junio C Hamano	Merge branch 'jk/maint-1.7.2-status-ignored'	blob \| commitdiff \| raw
2011-06-06	Junio C Hamano	Merge branch 'jn/mime-type-with-params'	blob \| commitdiff \| raw
2011-06-06	Junio C Hamano	Merge branch 'jk/diff-not-so-quick'	blob \| commitdiff \| raw
2011-06-06	Junio C Hamano	Merge branch 'bc/maint-status-z-to-use-porcelain'	blob \| commitdiff \| raw
2011-05-31	Junio C Hamano	Merge remote-tracking branch 'ko/maint' into jc/diff...	blob \| commitdiff \| raw
2011-05-26	Junio C Hamano	Merge branch 'rg/no-gecos-in-pwent'	blob \| commitdiff \| raw
2011-05-26	Junio C Hamano	Merge branch 'jk/git-connection-deadlock-fix' into...	blob \| commitdiff \| raw
2011-05-26	Junio C Hamano	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	blob \| commitdiff \| raw
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom