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

[git] / Documentation / merge-options.txt

2007-07-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-07-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-07-02	Junio C Hamano	Merge 1.5.2.3 in	blob \| commitdiff \| raw
2007-07-01	Junio C Hamano	Merge branch 'ml/worktree'	blob \| commitdiff \| raw
2007-07-01	Junio C Hamano	Merge branch 'ei/worktree+filter'	blob \| commitdiff \| raw
2007-06-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-06-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-06-29	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-06-29	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-06-28	Junio C Hamano	Merge branch 'master' of git://git./gitk/gitk	blob \| commitdiff \| raw
2007-06-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-06-26	Junio C Hamano	Merge branch 'master' of git://git./gitk/gitk into...	blob \| commitdiff \| raw
2007-06-23	Junio C Hamano	Merge branch 'js/filter'	blob \| commitdiff \| raw
2007-06-22	Shawn O. Pearce	Import branch 'git-p4' of git://repo.or.cz/fast-export	blob \| commitdiff \| raw
2007-06-16	Junio C Hamano	Merge branch 'maint' to sync with GIT 1.5.2.2	blob \| commitdiff \| raw
2007-06-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-06-13	Junio C Hamano	Merge branch 'aw/cvs'	blob \| commitdiff \| raw
2007-06-13	Junio C Hamano	Merge branch 'ep/cvstag'	blob \| commitdiff \| raw
2007-06-12	Junio C Hamano	Merge branch 'lh/submodule'	blob \| commitdiff \| raw
2007-06-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-06-12	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-06-12	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-06-11	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-06-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-06-11	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-06-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-06-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-06-09	Junio C Hamano	Merge branch 'aj/pack'	blob \| commitdiff \| raw
2007-06-09	Junio C Hamano	Merge branch 'js/merge'	blob \| commitdiff \| raw
2007-06-09	Junio C Hamano	Merge branch 'ar/clone'	blob \| commitdiff \| raw
2007-06-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-06-07	Junio C Hamano	War on whitespace	blob \| commitdiff \| raw
2007-06-06	Junio C Hamano	Merge branch 'sv/objfixes'	blob \| commitdiff \| raw \| diff to current
2007-06-03	Junio C Hamano	Merge branch 'maint' to sync with 1.5.2.1	blob \| commitdiff \| raw \| diff to current
2007-06-03	Junio C Hamano	Merge branches 'lh/submodules' and 'pb/am'	blob \| commitdiff \| raw \| diff to current
2007-06-02	Junio C Hamano	Merge branch 'sp/pack'	blob \| commitdiff \| raw \| diff to current
2007-06-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-05-31	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'db/remote'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'dh/repack' (early part)	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'np/delta'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'jc/nodelta'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'ar/verbose'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'ar/run'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'ar/mergestat'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-05-25	Alex Riesen	Add a configuration option to control diffstat after...	blob \| commitdiff \| raw \| diff to current
2007-05-17	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-05-10	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-05-08	Shawn O. Pearce	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-05-07	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-05-07	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-05-07	Junio C Hamano	Merge git://git2./pub/scm/gitk/gitk into maint	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-04-15	Junio C Hamano	Merge git://git2./pub/scm/gitk/gitk into maint	blob \| commitdiff \| raw \| diff to current
2007-03-22	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2007-03-20	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2007-03-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-03-12	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-03-06	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-02-25	Junio C Hamano	Merge git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw \| diff to current
2007-02-21	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-02-18	Junio C Hamano	Merge git://git./pub/scm/gitk/gitk into maint	blob \| commitdiff \| raw \| diff to current
2007-02-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-02-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-02-12	Junio C Hamano	Merge git-gui	blob \| commitdiff \| raw \| diff to current
2007-01-15	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-11-29	Junio C Hamano	Merge master.kernel.org:/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-11-08	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-09-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-08-13	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-07-05	Junio C Hamano	Merge branch 'jc/sha1'	blob \| commitdiff \| raw \| diff to current
2006-06-29	Junio C Hamano	Merge branch 'jc/repack'	blob \| commitdiff \| raw \| diff to current
2006-06-26	Junio C Hamano	Merge branch 'jc/squash'	blob \| commitdiff \| raw \| diff to current
2006-06-24	Junio C Hamano	git-merge --squash	blob \| commitdiff \| raw \| diff to current
2006-06-13	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-06-10	Junio C Hamano	Merge git://git.kernel.org/pub/scm/git/gitweb	blob \| commitdiff \| raw \| diff to current
2006-06-07	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-06-04	Junio C Hamano	Merge branch 'new' of git://git./gitk/gitk into next	blob \| commitdiff \| raw \| diff to current
2006-06-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-05-03	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-04-24	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-04-17	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-04-07	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-04-05	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-03-31	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-03-26	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-02-22	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-02-07	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-12-12	Junio C Hamano	GIT 0.99.9m aka 1.0rc5 v0.99.9m v1.0rc5	blob \| commitdiff \| raw \| diff to current
2005-12-08	Junio C Hamano	Documentation: recursive is the default strategy these...	blob \| commitdiff \| raw \| diff to current
2005-12-07	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-29	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-28	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-27	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-22	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-20	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-19	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-07	Junio C Hamano	Merge branch 'master'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom