projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'maint'
[git] / Documentation / merge-strategies.txt
2007-06-29  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-06-29  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-06-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw
2007-06-26  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk into... blob | commitdiff | raw
2007-06-22  Shawn O. PearceImport branch 'git-p4' of git://repo.or.cz/fast-export blob | commitdiff | raw
2007-06-12  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-06-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-06-11  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-06-11  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-05-29  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-05-17  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-05-10  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-05-08  Shawn O. PearceMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-05-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-05-07  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-05-07  Junio C HamanoMerge git://git2./pub/scm/gitk/gitk into maint blob | commitdiff | raw
2007-04-18  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-04-18  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-04-15  Junio C HamanoMerge git://git2./pub/scm/gitk/gitk into maint blob | commitdiff | raw
2007-03-22  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2007-03-20  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2007-03-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-03-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-03-06  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-02-25  Junio C HamanoMerge git://repo.or.cz/git-gui into maint blob | commitdiff | raw
2007-02-21  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-02-18  Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint blob | commitdiff | raw
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-02-12  Junio C HamanoMerge git-gui blob | commitdiff | raw
2007-01-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk blob | commitdiff | raw
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-08-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-06-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-06-10  Junio C HamanoMerge git://git.kernel.org/pub/scm/git/gitweb blob | commitdiff | raw
2006-06-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-06-04  Junio C HamanoMerge branch 'new' of git://git./gitk/gitk into next blob | commitdiff | raw
2006-06-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-05-03  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-04-24  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-04-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-04-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-04-05  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-03-31  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-03-26  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-02-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-02-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2005-12-12  Junio C HamanoGIT 0.99.9m aka 1.0rc5 v0.99.9m v1.0rc5 blob | commitdiff | raw
2005-12-08  Junio C HamanoDocumentation: recursive is the default strategy these... blob | commitdiff | raw
2005-12-07  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-29  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-28  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-22  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-20  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-19  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-07  Junio C HamanoGIT 0.99.9e v0.99.9e blob | commitdiff | raw | diff to current
2005-11-06  Jon LoeligerRefactor merge strategies into separate includable... blob | commitdiff | raw | diff to current
Unnamed repository; edit this file 'description' to name the repository.