Code

test that git status works with merge conflict in, .gitmodules
[git.git] / t / t1005-read-tree-reset.sh
2011-04-11 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2011-03-26 Junio C HamanoMerge git-gui 0.14.0
2010-12-14 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-11-05 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2010-09-15 Junio C HamanoMerge git://repo.or.cz/git-gui
2010-08-19 Junio C HamanoMerge branch 'tr/xsize-bits' into maint
2010-08-18 Junio C HamanoMerge branch 'tr/xsize-bits'
2010-08-02 Junio C HamanoMerge git://repo.or.cz/git-gui into pt/git-gui
2010-05-21 Junio C HamanoMerge branch 'jn/gitweb-our-squelch'
2010-04-19 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-11 Junio C HamanoMerge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Junio C HamanoMerge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-03-07 Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-05 Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-02 Junio C HamanoMerge branch 'tr/maint-cherry-pick-list'
2010-03-02 Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-08 Junio C HamanoMerge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Junio C HamanoMerge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-31 Junio C HamanoMerge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-29 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-24 Junio C HamanoMerge branch 'maint' of git://git.spearce.org/git-gui...
2009-12-27 Junio C HamanoMerge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-09 Junio C HamanoMerge git://repo.or.cz/git-gui
2009-12-09 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-10-27 Junio C HamanoMerge git://repo.or.cz/git-gui
2009-09-21 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-28 Junio C HamanoMerge branch 'maint-1.5.6' into maint-1.6.0
2009-08-16 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-20 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-11 Junio C HamanoMerge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-05-03 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2009-05-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-02 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint
2009-03-28 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully'
2009-03-26 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s'
2009-03-22 Junio C HamanoMerge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-18 Junio C HamanoMerge branch 'jc/maint-1.6.0-read-tree-overlay'
2009-03-05 Junio C HamanoMerge branch 'jc/blame'
2009-03-02 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-02-11 Junio C HamanoMerge branch 'maint-1.5.6' into maint
2009-02-11 Junio C HamanoMerge branch 'maint-1.5.4' into maint-1.5.5
2009-01-24 Junio C HamanoMerge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-24 Junio C HamanoMerge branch 'tr/maint-no-index-fixes' into maint
2009-01-18 Junio C HamanoMerge branch 'tr/maint-no-index-fixes'
2009-01-14 Junio C HamanoMerge branch 'cb/maint-unpack-trees-absense'
2009-01-13 Junio C HamanoMerge branch 'ap/maint-apply-modefix' into maint
2009-01-07 Junio C HamanoMerge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03 Junio C HamanoMerge branch 'ap/maint-apply-modefix'
2008-12-27 Junio C HamanoMerge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20 Junio C HamanoGIT 1.6.0.6 v1.6.0.6
2008-12-18 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-17 Junio C HamanoGIT 1.5.5.6 v1.5.5.6
2008-12-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-02 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-29 Junio C HamanoMerge branch 'nd/narrow' (early part) into jc/add-i-t-a
2008-11-16 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-13 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Junio C HamanoMerge branch 'jn/gitweb-customlinks'
2008-11-13 Junio C HamanoMerge branch 'gb/gitweb-snapshot-pathinfo'
2008-11-13 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-09 Junio C HamanoMerge branch 'cj/maint-gitpm-fix-maybe-self' into maint
2008-11-09 Junio C HamanoMerge branch 'ar/maint-mksnpath' into maint
2008-11-09 Junio C HamanoMerge branch 'mv/maint-branch-m-symref' into maint
2008-11-09 Junio C HamanoMerge branch 'rs/blame'
2008-11-05 Junio C HamanoMerge branch 'jc/gitweb-fix-cloud-tag'
2008-11-05 Junio C HamanoMerge branch 'mv/maint-branch-m-symref'
2008-11-05 Junio C HamanoMerge branch 'mv/parseopt-checkout-index'
2008-11-03 Junio C HamanoMerge branch 'np/index-pack'
2008-11-03 Junio C HamanoMerge branch 'sh/rebase-i-p'
2008-11-03 Junio C HamanoMerge branch 'ag/blame-encoding'
2008-11-03 Junio C HamanoMerge branch 'gb/gitweb-pathinfo'
2008-11-03 Junio C HamanoMerge branch 'cj/maint-gitpm-fix-maybe-self'
2008-11-02 Junio C HamanoMerge branch 'js/maint-fetch-update-head' into maint
2008-11-02 Junio C HamanoMerge branch 'jk/maint-ls-files-other' into maint
2008-11-02 Junio C HamanoMerge branch 'jc/maint-reset-remove-unmerged-new' into...
2008-11-02 Junio C HamanoMerge branch 'maint'
2008-11-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-02 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-31 Junio C HamanoMerge branch 'maint'
2008-10-31 Junio C HamanoMerge branch 'ar/maint-mksnpath' into ar/mksnpath
2008-10-27 Junio C HamanoMerge branch 'ar/maint-mksnpath' into HEAD
2008-10-26 Junio C HamanoMerge branch 'maint'
2008-10-22 Junio C HamanoMerge branch 'jk/diff-convfilter'
2008-10-22 Junio C HamanoMerge branch 'js/maint-fetch-update-head'
2008-10-22 Junio C HamanoMerge branch 'jc/maint-co-track'
2008-10-22 Junio C HamanoMerge branch 'rs/alloc-ref'
2008-10-22 Junio C HamanoMerge branch 'jk/fix-ls-files-other'
2008-10-21 Junio C HamanoMerge branch 'jc/maint-reset-remove-unmerged-new'
2008-10-21 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-18 Junio C Hamanoreset --hard/read-tree --reset -u: remove unmerged...
2008-09-25 Shawn O. PearceMerge git://repo.or.cz/git-gui
next