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

[git] / Documentation / merge-strategies.txt

2010-01-20	Junio C Hamano	Merge branch 'bg/maint-remote-update-default' into...	blob \| commitdiff \| raw
2010-01-20	Junio C Hamano	Merge branch 'sb/maint-octopus' into maint	blob \| commitdiff \| raw
2010-01-20	Junio C Hamano	Merge branch 'bg/maint-add-all-doc' into maint	blob \| commitdiff \| raw
2010-01-20	Junio C Hamano	Merge branch 'maint-1.6.5' into maint	blob \| commitdiff \| raw
2010-01-19	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw \| diff to current
2010-01-19	Junio C Hamano	Merge branch 'dp/maint-1.6.5-fast-import-non-commit...	blob \| commitdiff \| raw
2010-01-19	Junio C Hamano	Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into...	blob \| commitdiff \| raw
2010-01-17	Junio C Hamano	Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'	blob \| commitdiff \| raw
2010-01-13	Junio C Hamano	Merge branch 'jc/checkout-merge-base'	blob \| commitdiff \| raw
2010-01-13	Junio C Hamano	Merge branch 'nd/sparse'	blob \| commitdiff \| raw
2010-01-12	Junio C Hamano	Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...	blob \| commitdiff \| raw
2010-01-10	Junio C Hamano	Merge branch 'jk/maint-1.6.5-reset-hard'	blob \| commitdiff \| raw
2010-01-10	Junio C Hamano	Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...	blob \| commitdiff \| raw
2010-01-10	Junio C Hamano	Merge branch 'bg/maint-remote-update-default'	blob \| commitdiff \| raw
2010-01-10	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2010-01-07	Junio C Hamano	Merge branch 'js/filter-branch-prime'	blob \| commitdiff \| raw
2010-01-07	Junio C Hamano	Merge branch 'sb/maint-octopus'	blob \| commitdiff \| raw
2010-01-07	Junio C Hamano	Merge branch 'bg/maint-add-all-doc'	blob \| commitdiff \| raw
2009-12-31	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-12-30	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw
2009-12-28	Junio C Hamano	Merge branch 'jk/1.7.0-status'	blob \| commitdiff \| raw
2009-12-27	Junio C Hamano	Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...	blob \| commitdiff \| raw
2009-12-26	Junio C Hamano	Merge branch 'gb/1.7.0-diff-whitespace-only-output'	blob \| commitdiff \| raw
2009-12-26	Junio C Hamano	Merge branch 'jc/1.7.0-diff-whitespace-only-status'	blob \| commitdiff \| raw
2009-12-26	Junio C Hamano	Merge branch 'jc/1.7.0-push-safety'	blob \| commitdiff \| raw
2009-12-26	Junio C Hamano	Merge branch 'jc/1.7.0-send-email-no-thread-default'	blob \| commitdiff \| raw
2009-12-26	Junio C Hamano	Merge branch 'sr/vcs-helper'	blob \| commitdiff \| raw
2009-12-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-16	Junio C Hamano	Merge branch 'maint' to sync with 1.6.5.7	blob \| commitdiff \| raw
2009-12-11	Junio C Hamano	Sync with 1.6.5.6	blob \| commitdiff \| raw
2009-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2009-12-09	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2009-12-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-07	Junio C Hamano	Merge branch 'master' into il/vcs-helper	blob \| commitdiff \| raw
2009-12-05	Junio C Hamano	Sync with 1.6.5.5	blob \| commitdiff \| raw
2009-12-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-03	Junio C Hamano	Merge branch 'jc/maint-am-keep' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'np/maint-sideband-favor-status' into...	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge in 1.6.5.4	blob \| commitdiff \| raw
2009-12-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-01	Junio C Hamano	Merge branch 'jc/deprecate-old-syntax-from-merge'	blob \| commitdiff \| raw
2009-12-01	Junio C Hamano	Merge branch 'jn/gitweb-blame'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'fc/maint-format-patch-pathspec-dashes'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'mm/maint-merge-ff-error-message-fix'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'ap/maint-merge-strategy-list-fix'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'jc/pretty-lf'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'cc/bisect-doc'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'em/commit-claim'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'jc/mailinfo-remove-brackets'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'fc/send-email-envelope'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'uk/maint-shortlog-encoding'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'jc/maint-am-keep'	blob \| commitdiff \| raw
2009-11-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-11-25	Junio C Hamano	Merge branch 'rs/work-around-grep-opt-insanity'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'rj/maint-cygwin-count-objects'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'rs/color-escape-has-zero-width'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'bg/apply-doc'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'mm/maint-hint-failed-merge'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'jc/log-stdin'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'mr/gitweb-snapshot'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'cc/replace'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'bg/fetch-multi'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge git://git.bogomips.org/git-svn	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'th/maint-remote-update-help-string'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'jn/faster-completion-startup'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'rj/maint-t9700'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'ls/maint-mailinfo-no-inbody'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'mo/maint-crlf-doc'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'th/remote-usage'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'pb/maint-use-custom-perl'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'mm/config-pathname-tilde-expand'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'bc/grep-i-F'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'jk/maint-break-rename-reduce-memory'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'tc/format-attribute'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'tr/maint-merge-ours-clarification' (early...	blob \| commitdiff \| raw
2009-11-18	Junio C Hamano	Merge branch 'np/maint-sideband-favor-status'	blob \| commitdiff \| raw \| diff to current
2009-11-15	Thomas Rast	Documentation: clarify 'ours' merge strategy	blob \| commitdiff \| raw
2009-10-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2009-09-21	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-09-16	Junio C Hamano	Merge branch 'tf/diff-whitespace-incomplete-line' into...	blob \| commitdiff \| raw \| diff to current
2009-09-15	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...	blob \| commitdiff \| raw \| diff to current
2009-09-15	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...	blob \| commitdiff \| raw \| diff to current
2009-09-15	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...	blob \| commitdiff \| raw \| diff to current
2009-09-15	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...	blob \| commitdiff \| raw \| diff to current
2009-09-03	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw \| diff to current
2009-09-03	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw \| diff to current
2009-09-01	Junio C Hamano	Merge branch 'tf/diff-whitespace-incomplete-line'	blob \| commitdiff \| raw \| diff to current
2009-08-28	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw \| diff to current
2009-08-21	Junio C Hamano	Merge branch 'jc/maint-merge-recursive-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-16	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-08-11	Junio C Hamano	Merge branch 'jc/maint-merge-recursive-fix'	blob \| commitdiff \| raw \| diff to current
2009-08-08	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw \| diff to current
2009-07-29	Junio C Hamano	Merge branch 'hv/cvsps-tests'	blob \| commitdiff \| raw \| diff to current
2009-07-02	Junio C Hamano	Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'	blob \| commitdiff \| raw \| diff to current
2009-06-22	Junio C Hamano	Merge branch 'sb/maint-1.6.0-add-config-fix' into maint	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom