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

[git] / Documentation / merge-strategies.txt

2009-06-22	Junio C Hamano	Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint	blob \| commitdiff \| raw
2009-06-21	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-06-21	Junio C Hamano	Merge branch 'pb/maint-1.6.2-userdiff-fix'	blob \| commitdiff \| raw
2009-06-21	Junio C Hamano	Merge branch 'sb/maint-1.6.0-add-config-fix'	blob \| commitdiff \| raw
2009-06-20	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2009-06-14	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-06-11	Junio C Hamano	Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...	blob \| commitdiff \| raw
2009-06-02	Junio C Hamano	Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint	blob \| commitdiff \| raw
2009-06-02	Junio C Hamano	Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...	blob \| commitdiff \| raw
2009-05-29	Junio C Hamano	Merge branch 'sb/maint-1.6.2-opt-filename-fix'	blob \| commitdiff \| raw
2009-05-26	Junio C Hamano	Merge branch 'js/maint-no-ln-across-libexec-and-bin...	blob \| commitdiff \| raw
2009-05-26	Junio C Hamano	Merge branch 'lt/maint-diff-reduce-lstat' into maint	blob \| commitdiff \| raw
2009-05-26	Junio C Hamano	Merge branch 'do/maint-merge-recursive-fix' into maint	blob \| commitdiff \| raw
2009-05-26	Junio C Hamano	Merge branch 'jk/maint-1.6.0-trace-argv' into maint	blob \| commitdiff \| raw
2009-05-25	Junio C Hamano	Merge branch 'master' into sb/opt-filename	blob \| commitdiff \| raw
2009-05-24	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-05-23	Junio C Hamano	Merge branch 'mg/track'	blob \| commitdiff \| raw
2009-05-23	Junio C Hamano	Merge branch 'js/maint-no-ln-across-libexec-and-bin'	blob \| commitdiff \| raw
2009-05-23	Junio C Hamano	Merge branch 'lt/maint-diff-reduce-lstat'	blob \| commitdiff \| raw
2009-05-23	Junio C Hamano	Merge branch 'do/maint-merge-recursive-fix'	blob \| commitdiff \| raw
2009-05-23	Junio C Hamano	Merge branch 'jk/maint-1.6.0-trace-argv'	blob \| commitdiff \| raw
2009-05-16	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-05-12	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-05-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-05-03	Junio C Hamano	Sync with GIT 1.6.2.5	blob \| commitdiff \| raw
2009-05-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2009-05-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2009-04-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-28	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-23	Junio C Hamano	Merge branch 'jc/maint-read-tree-multi'	blob \| commitdiff \| raw
2009-04-21	Junio C Hamano	Merge branch 'mk/maint-apply-swap'	blob \| commitdiff \| raw
2009-04-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-20	Junio C Hamano	Merge branch 'mm/maint-add-p-quit'	blob \| commitdiff \| raw
2009-04-20	Junio C Hamano	Sync with 1.6.2.4	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'lt/pack-object-memuse'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-13	Junio C Hamano	Mark t1301 permission test to depend on POSIXPERM	blob \| commitdiff \| raw
2009-04-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-08	Junio C Hamano	Merge branch 'bs/maint-1.6.0-tree-walk-prefix'	blob \| commitdiff \| raw
2009-04-08	Junio C Hamano	Merge branch 'js/maint-submodule-checkout'	blob \| commitdiff \| raw
2009-04-08	Junio C Hamano	Merge branch 'cb/maint-merge-recursive-submodule-fix'	blob \| commitdiff \| raw
2009-04-06	Junio C Hamano	Merge branch 'jc/name-branch'	blob \| commitdiff \| raw
2009-04-06	Junio C Hamano	Merge branch 'jc/shared-literally'	blob \| commitdiff \| raw
2009-04-06	Junio C Hamano	Merge branch 'sb/format-patch-patchname'	blob \| commitdiff \| raw
2009-04-05	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-05	Junio C Hamano	Merge branch 'cc/sha1-bsearch' into HEAD	blob \| commitdiff \| raw
2009-04-02	Junio C Hamano	Sync with 1.6.2.2	blob \| commitdiff \| raw
2009-04-02	Junio C Hamano	Merge branch 'ef/fast-export'	blob \| commitdiff \| raw
2009-04-02	Junio C Hamano	Merge branch 'tr/maint-1.6.1-doc-format-patch--root'	blob \| commitdiff \| raw
2009-04-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-02	Junio C Hamano	Merge branch 'jc/maint-1.6.0-keep-pack'	blob \| commitdiff \| raw
2009-04-02	Junio C Hamano	Merge branch 'kb/tracking-count-no-merges'	blob \| commitdiff \| raw
2009-03-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-03-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-03-28	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-03-28	Junio C Hamano	Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'	blob \| commitdiff \| raw
2009-03-28	Junio C Hamano	Merge branch 'js/remote-improvements'	blob \| commitdiff \| raw
2009-03-28	Junio C Hamano	Merge branch 'jk/clone-post-checkout'	blob \| commitdiff \| raw
2009-03-27	Junio C Hamano	Merge branch 'db/push-cleanup'	blob \| commitdiff \| raw
2009-03-26	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-03-26	Junio C Hamano	Merge branch 'db/push-cleanup'	blob \| commitdiff \| raw
2009-03-26	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blame-s'	blob \| commitdiff \| raw
2009-03-26	Junio C Hamano	Merge branch 'mg/http-auth'	blob \| commitdiff \| raw
2009-03-26	Junio C Hamano	Merge branch 'jk/reflog-date'	blob \| commitdiff \| raw
2009-03-26	Junio C Hamano	Merge branch 'jc/attributes-checkout'	blob \| commitdiff \| raw
2009-03-26	Junio C Hamano	Merge branch 'js/maint-diff-temp-smudge'	blob \| commitdiff \| raw
2009-03-26	Junio C Hamano	Merge branch 'js/maint-1.6.0-exec-path-env'	blob \| commitdiff \| raw
2009-03-26	Junio C Hamano	Merge branch 'bc/maint-1.6.1-branch-deleted-was'	blob \| commitdiff \| raw
2009-03-26	Junio C Hamano	Merge branch 'fg/push-default'	blob \| commitdiff \| raw
2009-03-26	Junio C Hamano	Merge branch 'dm/maint-docco'	blob \| commitdiff \| raw
2009-03-26	Wincent Colaiuta	Grammar fixes to "merge" and "patch-id" docs	blob \| commitdiff \| raw
2009-03-02	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-02-11	Junio C Hamano	Merge branch 'maint-1.5.4' into maint-1.5.5	blob \| commitdiff \| raw \| diff to current
2008-12-22	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-18	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-12-17	Junio C Hamano	GIT 1.5.5.6 v1.5.5.6	blob \| commitdiff \| raw \| diff to current
2008-12-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-12-02	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-01	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-16	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-13	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-11-13	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-02	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2008-10-21	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-09-07	Junio C Hamano	Merge updated git-gui and gitk that call each other	blob \| commitdiff \| raw \| diff to current
2008-09-06	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2008-08-17	Junio C Hamano	Merge git-gui 0.11.0	blob \| commitdiff \| raw \| diff to current
2008-08-17	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-07-30	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom