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