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
/
t6120-describe.sh
2011-05-13
Junio C Hamano
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'gr/cvsimport-alternative-cvspass-location...
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'jk/merge-one-file-working-tree' into...
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-diff-files-unmerged' into maint
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'mz/maint-rename-unmerged' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'jh/dirstat' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'sp/maint-clear-postfields' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-stash-oob' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-upload-pack-shallow' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'jc/pack-objects-bigfile' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'mg/reflog-with-options' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'ar/clean-rmdir-empty' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'mg/sha1-path-advise' into maint
blob
|
commitdiff
|
raw
2011-04-29
Junio C Hamano
Merge branch 'mg/x-years-12-months' into maint
blob
|
commitdiff
|
raw
2011-04-19
Junio C Hamano
Sync with 1.7.4.5
blob
|
commitdiff
|
raw
2011-04-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-04-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-04-12
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink'
blob
|
commitdiff
|
raw
2011-04-12
Junio C Hamano
Merge branch 'nd/init-gitdir'
blob
|
commitdiff
|
raw
2011-04-11
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2011-04-06
Junio C Hamano
Sync with 1.7.4.4
blob
|
commitdiff
|
raw
2011-04-06
Junio C Hamano
Merge branch 'jk/maint-remote-mirror-safer'
blob
|
commitdiff
|
raw
2011-04-06
Junio C Hamano
Merge branch 'mg/doc-revisions-txt'
blob
|
commitdiff
|
raw
2011-04-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-04-04
Junio C Hamano
Merge branch 'jl/submodule-fetch-on-demand'
blob
|
commitdiff
|
raw
2011-04-04
Junio C Hamano
Merge branch 'jc/rev-list-options-fix'
blob
|
commitdiff
|
raw
2011-04-04
Junio C Hamano
Merge branch 'nm/maint-conflicted-submodule-entries'
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-04-03
Junio C Hamano
Sync with 1.7.4.3
blob
|
commitdiff
|
raw
2011-04-02
Junio C Hamano
Merge branch 'nd/init-gitdir'
blob
|
commitdiff
|
raw
2011-04-02
Junio C Hamano
Merge branch 'jc/merge-sans-branch'
blob
|
commitdiff
|
raw
2011-04-02
Junio C Hamano
Merge branch 'jr/grep-en-config'
blob
|
commitdiff
|
raw
2011-04-02
Junio C Hamano
Merge branch 'ab/i18n-st'
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-03-27
Junio C Hamano
Merge branch 'jc/maint-rerere-in-workdir'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-26
Junio C Hamano
Merge git-gui 0.14.0
blob
|
commitdiff
|
raw
|
diff to current
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-16
Junio C Hamano
Merge branch 'jk/diffstat-binary' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-03-14
Junio C Hamano
Merge branch 'sp/maint-smart-http-sans-100-continue'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-10
Ævar Arnfjörð Bjar...
i18n: git-describe basic messages
blob
|
commitdiff
|
raw
2011-03-04
Junio C Hamano
Merge branch 'jk/diffstat-binary'
blob
|
commitdiff
|
raw
|
diff to current
2011-02-28
Junio C Hamano
Merge branch 'sp/maint-smart-http-sans-100-continue'
blob
|
commitdiff
|
raw
|
diff to current
2011-02-16
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
|
diff to current
2011-02-10
Junio C Hamano
Merge branch 'tr/merge-unborn-clobber'
blob
|
commitdiff
|
raw
|
diff to current
2011-02-10
Junio C Hamano
Merge branch 'maint-1.7.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-01-19
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-01-19
Junio C Hamano
Merge branch 'tr/submodule-relative-scp-url' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-01-19
Junio C Hamano
Merge branch 'jn/maint-fast-import-object-reuse' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-01-13
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-13
Junio C Hamano
Merge branch 'tr/submodule-relative-scp-url'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-10
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
|
diff to current
2010-12-26
Junio C Hamano
Merge branch 'rs/maint-diff-fd-leak' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-12-16
Junio C Hamano
Merge branch 'jn/maint-fast-import-object-reuse'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-15
Junio C Hamano
Git 1.7.1.4
v1.7.1.4
blob
|
commitdiff
|
raw
|
diff to current
2010-12-15
Junio C Hamano
Git 1.6.6.3
v1.6.6.3
blob
|
commitdiff
|
raw
|
diff to current
2010-12-15
Junio C Hamano
Git 1.6.5.9
v1.6.5.9
blob
|
commitdiff
|
raw
|
diff to current
2010-12-14
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2010-12-14
Junio C Hamano
Merge branch 'mz/maint-rebase-stat-config' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-12-13
Junio C Hamano
Merge branch 'mz/maint-rebase-stat-config'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-09
Junio C Hamano
Merge branch 'np/diff-in-corrupt-repository' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-12-09
Junio C Hamano
Merge branch 'cm/diff-check-at-eol' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-12-02
Junio C Hamano
Git 1.7.1.3
v1.7.1.3
blob
|
commitdiff
|
raw
|
diff to current
2010-12-02
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
|
diff to current
2010-12-01
Junio C Hamano
Merge branch 'js/maint-apply-tab-in-indent-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-11-30
Junio C Hamano
Merge branch 'np/diff-in-corrupt-repository'
blob
|
commitdiff
|
raw
|
diff to current
2010-11-30
Junio C Hamano
Merge branch 'cm/diff-check-at-eol'
blob
|
commitdiff
|
raw
|
diff to current
2010-11-24
Junio C Hamano
Merge branch 'aw/git-p4-deletion' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-11-05
Junio C Hamano
Merge branch 'aw/git-p4-deletion'
blob
|
commitdiff
|
raw
|
diff to current
2010-11-05
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2010-10-27
Junio C Hamano
Merge branch 'en/tree-walk-optim'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-29
Junio C Hamano
Merge branch 'rr/format-patch-count-without-merges'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-18
Junio C Hamano
Merge branch 'js/ls-files-x-doc'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'bc/maint-fetch-url-only'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-06
Junio C Hamano
Merge branch 'xx/trivial' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-09-04
Junio C Hamano
Merge branch 'nd/maint-fix-replace'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-01
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-31
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'nd/fix-sparse-checkout'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-19
Junio C Hamano
Merge branch 'tr/xsize-bits' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-19
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'...
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'tr/xsize-bits'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-13
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-13
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-03
Junio C Hamano
Merge branch 'sv/maint-diff-q-clear-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-02
Junio C Hamano
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2010-07-27
Junio C Hamano
Sync with 1.7.0 series
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.6.5' into maint-1.6.6
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.6.4' into maint-1.6.5
blob
|
commitdiff
|
raw
|
diff to current
2010-07-16
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-09
Junio C Hamano
Merge remote branch 'ko/master' into jc/read-tree-cache...
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Junio C Hamano
Merge branch 'tr/receive-pack-aliased-update-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
