Andrew's git / gitweb.git / history
?
Merge branch 'jc/ls-remote-short-help'
[gitweb.git] / Documentation / technical / trivial-merge.txt
2011-04-11 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2011-03-26 Merge git-gui 0.14.0 blob | diff | raw
2010-12-14 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2010-09-15 Merge git://repo.or.cz/git-gui blob | diff | raw
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui blob | diff | raw
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2 blob | diff | raw
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui... blob | diff | raw
2009-12-09 Merge git://repo.or.cz/git-gui blob | diff | raw
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2009-10-27 Merge git://repo.or.cz/git-gui blob | diff | raw
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2009-05-02 Merge git://repo.or.cz/git-gui blob | diff | raw
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-12-18 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-12-02 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-12-01 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-11-16 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-11-13 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-11-02 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-09-25 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-09-07 Merge updated git-gui and gitk that call each other blob | diff | raw
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2008-08-17 Merge git-gui 0.11.0 blob | diff | raw
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-08-06 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-07-30 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-07-27 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-07-15 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-07-06 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-05-27 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-05-15 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-05-15 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-04-08 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-04-05 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-04-02 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-03-16 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2008-03-15 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-03-12 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-03-06 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2008-03-01 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2008-03-01 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2008-02-23 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2008-02-17 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-02-17 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-02-13 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-02-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-01-24 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-01-21 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-01-21 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-01-21 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-01-11 Merge ../gitk blob | diff | raw
2008-01-09 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw
2008-01-05 Merge git://repo.or.cz/git-gui blob | diff | raw
2007-12-07 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-11-21 Merge git://repo.or.cz/git-gui blob | diff | raw
2007-10-28 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw
2007-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2007-10-21 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-09-18 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-08-29 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw
2007-08-27 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-08-21 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw
2007-08-19 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-08-19 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw
2007-08-13 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw
2007-07-30 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-07-28 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw
2007-07-14 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw
2007-07-12 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw
2007-07-12 Merge commit 'git-gui/master' blob | diff | raw
2007-07-12 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-06-29 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-06-29 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-06-28 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw
2007-06-26 Merge branch 'master' of git://git./gitk/gitk into... blob | diff | raw
2007-06-22 Import branch 'git-p4' of git://repo.or.cz/fast-export blob | diff | raw
2007-06-12 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-06-12 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-06-11 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-06-11 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-05-29 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-05-17 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-05-10 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-05-08 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
next