merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t5513-fetch-track.sh
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-08 Merge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-31 Merge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-10-27 Merge git://repo.or.cz/git-gui
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-02-11 Merge branch 'maint-1.5.5' into maint-1.5.6
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-18 Merge git://repo.or.cz/git-gui
2008-12-17 GIT 1.5.6.6 v1.5.6.6
2008-12-02 Merge git://repo.or.cz/git-gui
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://repo.or.cz/git-gui
2008-11-16 Merge git://repo.or.cz/git-gui
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-07 Merge updated git-gui and gitk that call each other
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-27 Merge branch 'jc/add-addremove'
2008-08-20 Merge branch 'ph/enable-threaded'
2008-08-20 Merge branch 'jk/pager-swap'
2008-08-20 Merge branch 'rs/imap'
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-07 Merge branch 'lt/config-fsync' into maint
2008-08-07 Merge branch 'jc/reflog-expire' into maint
2008-08-07 Merge branch 'ag/rewrite_one' into maint
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-02 make sure parsed wildcard refspec ends with slash
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 make sure parsed wildcard refspec ends with slash