Add a second testcase for handling invalid strategies in git-merge
[gitweb.git] / templates / Makefile
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-25 Merge branch 'maint'
2008-07-24 Merge branch 'maint' into ph/checkout
2008-07-21 Merge branch 'maint'
2008-07-19 Merge branch 'maint'
2008-07-17 Merge branch 'sp/maint-index-pack'
2008-07-17 Merge branch 'maint'
2008-07-16 Merge branch 'mv/merge-in-c'
2008-07-16 Merge branch 'ag/rewrite_one'
2008-07-16 Merge branch 'js/maint-pretty-mailmap'
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-15 Merge branch 'ls/maint-mailinfo-patch-label'
2008-07-15 Merge branch 'jc/branch-merged'
2008-07-15 Merge branch 'sp/maint-bash-completion-optim'
2008-07-13 Merge branch 'sp/maint-bash-completion-optim'
2008-07-13 Merge branch 'maint' to sync with 1.5.6.3
2008-07-13 Merge branch 'ph/parseopt-step-blame'
2008-07-13 Merge branch 'tr/add-i-e'
2008-07-09 Merge branch 'js/apply-root'
2008-07-09 Merge branch 'jc/reflog-expire'
2008-07-09 Merge branch 'sp/maint-pack-memuse'
2008-07-09 Merge branch 'maint'
2008-07-07 Merge branch 'qq/maint'
2008-07-07 Merge branch 'js/maint-daemon-syslog'
2008-07-07 Merge branch 'maint'
2008-07-07 Merge branch 'jc/rerere'
2008-07-07 Merge branch 'dr/ceiling'
2008-07-07 Merge branch 'db/no-git-config'
2008-07-07 Merge branch 'js/import-zip'
2008-07-07 Merge branch 'maint'
2008-07-07 Merge branch 'qq/maint'
2008-07-06 Merge git://repo.or.cz/git-gui
2008-07-06 Merge branch 'qq/maint'
2008-07-06 Merge branch 'qq/maint'
2008-07-04 Merge branch 'maint'
2008-07-03 Merge branch 'j6t/mingw'
2008-06-26 When installing, be prepared that template_dir may...
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-15 Merge git://repo.or.cz/git-gui
2008-05-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-09 Merge branch 'jc/rename'
2008-04-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-05 Merge git://repo.or.cz/git-gui
2008-04-02 Merge git://repo.or.cz/git-gui
2008-03-16 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-03-12 Merge git://repo.or.cz/git-gui
2008-03-12 Merge branch 'js/remote'
2008-03-11 Merge branch 'jc/cherry-pick' (early part)
2008-03-08 Merge branch 'mh/maint-http-proxy-fix' into maint
2008-03-08 Merge branch 'js/maint-daemon' into maint
2008-03-08 Merge branch 'js/maint-cvsexport' into maint
2008-03-08 Merge branch 'jc/maint-log-merge-left-right' into maint
2008-03-08 Merge branch 'ew/maint-svn-cert-fileprovider' into...
2008-03-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-03-03 Merge commit '74359821' into js/reflog-delete
2008-03-03 Merge branch 'np/verify-pack'
2008-03-02 Merge branch 'sp/describe-tag'
2008-03-02 Merge branch 'pb/cvsimport'
2008-03-02 Merge branch 'jc/maint-log-merge-left-right'
2008-03-02 Merge branch 'mh/maint-http-proxy-fix'
2008-03-02 Merge branch 'cb/http-test'
2008-03-02 Merge branch 'jc/remote-multi-url'
2008-03-02 Merge branch 'jn/gitweb-grep'
2008-03-02 Merge branch 'mk/maint-parse-careful'
2008-03-02 Merge branch 'sb/describe-long'
2008-03-02 Merge branch 'ew/maint-svn-cert-fileprovider'
2008-03-02 Merge branch 'js/maint-daemon'
2008-03-01 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-01 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-29 Merge branch 'maint'
2008-02-28 templates/Makefile: don't depend on local umask setting
2008-02-23 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23 Merge branch 'bc/reflog-fix' into js/reflog-delete
2008-02-17 Merge git://repo.or.cz/git-gui
2008-02-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-13 Merge git://repo.or.cz/git-gui
2008-02-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-24 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-11 Merge ../gitk
2008-01-09 Merge branch 'master' of git://git./gitk/gitk
2008-01-08 Merge in GIT 1.5.3.8
2008-01-05 Merge git://repo.or.cz/git-gui
2007-12-31 Merge branch 'maint' of git://linux-nfs.org/~bfields/git
2007-12-18 Merge branch 'maint'
2007-12-10 Merge branch 'master' into cc/help
2007-12-09 Merge branch 'jc/spht'
2007-12-09 Merge branch 'maint'
2007-12-07 Merge branch 'master' of git://repo.or.cz/git-gui
2007-12-07 Merge branch 'maint'
2007-12-06 Merge branch 'maint'
2007-12-05 Merge branch 'wc/add-i'
2007-12-05 Merge branch 'kh/commit'
2007-12-05 Merge branch 'sp/refspec-match'
2007-12-04 install-sh from automake does not like -m without delim...
next