git.ipfire.org Git - thirdparty/git.git/history - Documentation/merge-options.txt

]> git.ipfire.org Git - thirdparty/git.git/history - Documentation/merge-options.txt

projects / thirdparty / git.git / history

[thirdparty/git.git] / Documentation / merge-options.txt

2006-07-05	Junio C Hamano	Merge branch 'jc/sha1'	blob \| commitdiff \| raw
2006-06-29	Junio C Hamano	Merge branch 'jc/repack'	blob \| commitdiff \| raw
2006-06-26	Junio C Hamano	Merge branch 'jc/squash'	blob \| commitdiff \| raw
2006-06-24	Junio C Hamano	git-merge --squash	blob \| commitdiff \| raw
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-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
2005-11-07	Jon Loeliger	Refactored merge options into separate merge-options...	blob \| commitdiff \| raw \| diff to current

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

RSS Atom