projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Documentation: clarify diff --cc
[git] / Documentation / merge-strategies.txt
2008-06-27  Junio C HamanoMerge branch 'maint-1.5.4' into maint-1.5.5 blob | commitdiff | raw
2008-06-11  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2008-05-27  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-05-26  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-05-24  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2008-05-23  Junio C HamanoMerge branch 'maint-1.5.4' into maint v1.5.5.2 blob | commitdiff | raw
2008-05-21  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-05-15  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-05-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2008-05-14  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-05-11  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-05-09  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-05-04  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-04-30  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-04-28  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-04-25  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-04-23  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-04-19  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-04-17  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-04-16  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-04-12  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-04-12  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-04-10  Junio C HamanoMerge branch 'maint-1.5.4' into maint blob | commitdiff | raw
2008-04-09  Junio C HamanoMerge branch 'jc/rename' blob | commitdiff | raw
2008-04-09  Junio C HamanoMerge branch 'mk/unpack-careful' blob | commitdiff | raw
2008-04-09  Junio C HamanoMerge branch 'fl/send-email-outside' blob | commitdiff | raw
2008-04-09  Junio C HamanoMerge branch 'jc/rebase' blob | commitdiff | raw
2008-04-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2008-04-07  Junio C HamanoMerge branch 'jc/maint-apply-match-beginning' blob | commitdiff | raw
2008-04-05  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-04-02  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-03-28  Junio C HamanoGIT 1.5.5-rc2 v1.5.5-rc2 blob | commitdiff | raw
2008-03-27  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2008-03-26  Junio C HamanoMerge branch 'jc/maint-fetch-regression-1.5.4' blob | commitdiff | raw
2008-03-23  Junio C HamanoMerge branch 'git-p4' of git://repo.or.cz/git/git-p4 blob | commitdiff | raw
2008-03-19  Miklos VajnaDocumentation/git-merge: document subtree strategy. blob | commitdiff | raw
2008-03-16  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-03-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2008-03-12  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-03-06  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2008-03-01  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-03-01  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2008-02-23  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2008-02-17  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-02-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2008-02-13  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-02-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2008-01-24  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-01-21  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-01-21  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-01-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2008-01-11  Junio C HamanoMerge ../gitk blob | commitdiff | raw | diff to current
2008-01-09  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2008-01-05  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-12-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-11-21  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-10-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-10-21  Shawn O. PearceMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-10-21  Shawn O. PearceMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-09-18  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-08-29  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-08-27  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-08-21  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-08-19  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-08-19  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-08-13  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-07-30  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-07-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-07-14  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-07-12  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-07-12  Junio C HamanoMerge commit 'git-gui/master' blob | commitdiff | raw | diff to current
2007-07-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-06-29  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-06-29  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-06-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-06-26  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk into... blob | commitdiff | raw | diff to current
2007-06-22  Shawn O. PearceImport branch 'git-p4' of git://repo.or.cz/fast-export blob | commitdiff | raw | diff to current
2007-06-12  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-06-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-06-11  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-06-11  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-05-29  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-05-17  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-05-10  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-05-08  Shawn O. PearceMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-05-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-05-07  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-05-07  Junio C HamanoMerge git://git2./pub/scm/gitk/gitk into maint blob | commitdiff | raw | diff to current
2007-04-18  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-04-18  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-04-15  Junio C HamanoMerge git://git2./pub/scm/gitk/gitk into maint blob | commitdiff | raw | diff to current
2007-03-22  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-03-20  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-03-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-03-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-03-06  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-02-25  Junio C HamanoMerge git://repo.or.cz/git-gui into maint blob | commitdiff | raw | diff to current
2007-02-21  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-02-18  Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint blob | commitdiff | raw | diff to current
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.