git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - git-merge-ours.sh

projects / thirdparty / git.git / history

[thirdparty/git.git] / git-merge-ours.sh

2007-05-17	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-05-10	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-05-08	Shawn O. Pearce	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-05-07	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-05-07	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw
2007-05-07	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk into...	blob \| commitdiff \| raw
2007-04-18	Junio C Hamano	Merge branch 'fl/cvsserver'	blob \| commitdiff \| raw
2007-04-18	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-04-18	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw
2007-04-15	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk into...	blob \| commitdiff \| raw
2007-04-09	Junio C Hamano	Merge branch 'js/fetch-progress'	blob \| commitdiff \| raw
2007-04-04	Junio C Hamano	Merge branch 'jc/bisect'	blob \| commitdiff \| raw
2007-04-04	Junio C Hamano	Merge 1.5.0.7 in	blob \| commitdiff \| raw
2007-03-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-03-28	Junio C Hamano	Merge branch 'maint' to synchronize with 1.5.0.6	blob \| commitdiff \| raw
2007-03-26	Junio C Hamano	Merge branch 'jc/fpl'	blob \| commitdiff \| raw
2007-03-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-03-25	Junio C Hamano	Merge branch 'js/remote-show-push'	blob \| commitdiff \| raw
2007-03-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-03-25	Alex Riesen	Use diff* with --exit-code in git-am, git-rebase and...	blob \| commitdiff \| raw
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.kernel.org/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-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.kernel.org/pub/scm...	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-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	GIT 0.99.9e v0.99.9e	blob \| commitdiff \| raw \| diff to current
2005-11-03	Junio C Hamano	GIT 0.99.9c v0.99.9c	blob \| commitdiff \| raw \| diff to current
2005-11-03	Junio C Hamano	git-merge-ours: make sure our index matches HEAD	blob \| commitdiff \| raw \| diff to current
2005-11-03	Junio C Hamano	Add 'ours' merge strategy.	blob \| commitdiff \| raw \| diff to current

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

RSS Atom