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
/
t0005-signals.sh
2011-05-13
Junio C Hamano
Merge branch 'jk/merge-one-file-working-tree' into...
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'sp/maint-clear-postfields' into maint
blob
|
commitdiff
|
raw
2011-04-11
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary' into...
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter' into maint
blob
|
commitdiff
|
raw
2011-03-27
Junio C Hamano
Merge branch 'jc/maint-rerere-in-workdir'
blob
|
commitdiff
|
raw
2011-03-26
Junio C Hamano
Merge git-gui 0.14.0
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary'
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'jk/diffstat-binary' into maint
blob
|
commitdiff
|
raw
2011-03-14
Junio C Hamano
Merge branch 'sp/maint-smart-http-sans-100-continue'
blob
|
commitdiff
|
raw
2011-03-04
Junio C Hamano
Merge branch 'jk/diffstat-binary'
blob
|
commitdiff
|
raw
2011-02-28
Junio C Hamano
Merge branch 'sp/maint-smart-http-sans-100-continue'
blob
|
commitdiff
|
raw
2011-02-16
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
2011-02-10
Junio C Hamano
Merge branch 'tr/merge-unborn-clobber'
blob
|
commitdiff
|
raw
2011-02-10
Junio C Hamano
Merge branch 'maint-1.7.0' into maint
blob
|
commitdiff
|
raw
2011-01-27
Junio C Hamano
Merge branch 'jn/fast-import-empty-tree-removal' into...
blob
|
commitdiff
|
raw
2011-01-19
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc' into maint
blob
|
commitdiff
|
raw
2011-01-19
Junio C Hamano
Merge branch 'tr/submodule-relative-scp-url' into maint
blob
|
commitdiff
|
raw
2011-01-19
Junio C Hamano
Merge branch 'jn/maint-fast-import-object-reuse' into...
blob
|
commitdiff
|
raw
2011-01-13
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc'
blob
|
commitdiff
|
raw
2011-01-13
Junio C Hamano
Merge branch 'tr/submodule-relative-scp-url'
blob
|
commitdiff
|
raw
2011-01-10
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
2010-12-26
Junio C Hamano
Merge branch 'rs/maint-diff-fd-leak' into maint
blob
|
commitdiff
|
raw
2010-12-16
Junio C Hamano
Merge branch 'jn/maint-fast-import-object-reuse'
blob
|
commitdiff
|
raw
2010-12-15
Junio C Hamano
Git 1.7.1.4
v1.7.1.4
blob
|
commitdiff
|
raw
2010-12-14
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-12-14
Junio C Hamano
Merge branch 'mz/maint-rebase-stat-config' into maint
blob
|
commitdiff
|
raw
2010-12-13
Junio C Hamano
Merge branch 'mz/maint-rebase-stat-config'
blob
|
commitdiff
|
raw
2010-12-09
Junio C Hamano
Merge branch 'np/diff-in-corrupt-repository' into maint
blob
|
commitdiff
|
raw
2010-12-09
Junio C Hamano
Merge branch 'cm/diff-check-at-eol' into maint
blob
|
commitdiff
|
raw
2010-12-02
Junio C Hamano
Git 1.7.1.3
v1.7.1.3
blob
|
commitdiff
|
raw
2010-12-02
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
2010-12-01
Junio C Hamano
Merge branch 'js/maint-apply-tab-in-indent-fix' into...
blob
|
commitdiff
|
raw
2010-11-30
Junio C Hamano
Merge branch 'np/diff-in-corrupt-repository'
blob
|
commitdiff
|
raw
2010-11-30
Junio C Hamano
Merge branch 'cm/diff-check-at-eol'
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'aw/git-p4-deletion' into maint
blob
|
commitdiff
|
raw
2010-11-05
Junio C Hamano
Merge branch 'aw/git-p4-deletion'
blob
|
commitdiff
|
raw
2010-11-05
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'kb/merge-recursive-rename-threshold'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'jf/merge-ignore-ws'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'en/tree-walk-optim'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'rr/format-patch-count-without-merges'
blob
|
commitdiff
|
raw
2010-09-18
Junio C Hamano
Merge branch 'js/ls-files-x-doc'
blob
|
commitdiff
|
raw
2010-09-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2010-09-08
Junio C Hamano
Merge branch 'bc/maint-fetch-url-only'
blob
|
commitdiff
|
raw
2010-09-08
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
blob
|
commitdiff
|
raw
2010-09-06
Junio C Hamano
Merge branch 'xx/trivial' into maint
blob
|
commitdiff
|
raw
2010-09-04
Junio C Hamano
Merge branch 'nd/maint-fix-replace'
blob
|
commitdiff
|
raw
2010-09-03
Junio C Hamano
Merge branch 'jn/merge-renormalize'
blob
|
commitdiff
|
raw
2010-09-01
Junio C Hamano
Merge branch 'gp/pack-refs-remove-empty-dirs' into...
blob
|
commitdiff
|
raw
2010-09-01
Junio C Hamano
Merge branch 'sg/rerere-gc-old-still-used' into maint
blob
|
commitdiff
|
raw
2010-09-01
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix' into maint
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'sg/rerere-gc-old-still-used'
blob
|
commitdiff
|
raw
2010-08-22
Junio C Hamano
Merge branch 'nd/fix-sparse-checkout'
blob
|
commitdiff
|
raw
2010-08-22
Junio C Hamano
Merge branch 'hv/submodule-find-ff-merge'
blob
|
commitdiff
|
raw
2010-08-22
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix'
blob
|
commitdiff
|
raw
2010-08-19
Junio C Hamano
Merge branch 'tr/xsize-bits' into maint
blob
|
commitdiff
|
raw
2010-08-19
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix' into maint
blob
|
commitdiff
|
raw
2010-08-18
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'...
blob
|
commitdiff
|
raw
2010-08-18
Junio C Hamano
Merge branch 'tf/string-list-init'
blob
|
commitdiff
|
raw
2010-08-18
Junio C Hamano
Merge branch 'jn/fast-import-subtree'
blob
|
commitdiff
|
raw
2010-08-18
Junio C Hamano
Merge branch 'ar/string-list-foreach'
blob
|
commitdiff
|
raw
2010-08-18
Junio C Hamano
Merge branch 'tr/xsize-bits'
blob
|
commitdiff
|
raw
2010-08-18
Junio C Hamano
Merge branch 'tc/checkout-B'
blob
|
commitdiff
|
raw
2010-08-13
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix'
blob
|
commitdiff
|
raw
2010-08-13
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'
blob
|
commitdiff
|
raw
2010-08-03
Junio C Hamano
Merge branch 'gp/pack-refs-remove-empty-dirs'
blob
|
commitdiff
|
raw
2010-08-03
Junio C Hamano
Merge branch 'sv/maint-diff-q-clear-fix' into maint
blob
|
commitdiff
|
raw
2010-08-02
Junio C Hamano
Merge branch 'ab/tap' into maint
blob
|
commitdiff
|
raw
2010-08-02
Junio C Hamano
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
commitdiff
|
raw
2010-07-27
Junio C Hamano
Sync with 1.7.0 series
blob
|
commitdiff
|
raw
2010-07-26
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
2010-07-16
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'jn/paginate-fix'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'ns/merge-recursive-uptodate'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'jn/tests'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'eb/doc-log-manpage'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'jn/grep-open'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'mg/revision-doc'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'jk/maint-status-keep-index-timestamp'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'jc/rebase-i-commit-msg-fix'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'ab/submodule-add-f'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'bc/maint-makefile-fixes'
blob
|
commitdiff
|
raw
2010-07-14
Junio C Hamano
Merge branch 'jc/read-tree-cache-tree-fix'
blob
|
commitdiff
|
raw
2010-07-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-07-09
Johannes Sixt
t0005: work around strange $? in ksh when program termi...
blob
|
commitdiff
|
raw
2010-05-21
Junio C Hamano
Merge branch 'jn/gitweb-our-squelch'
blob
|
commitdiff
|
raw
|
diff to current
2010-04-19
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2010-04-11
Junio C Hamano
Merge branch 'rc/maint-reflog-msg-for-forced-branch...
blob
|
commitdiff
|
raw
|
diff to current
2010-04-10
Junio C Hamano
Merge branch 'rc/maint-reflog-msg-for-forced-branch'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-08
Junio C Hamano
Merge branch 'fn/maint-mkdtemp-compat' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'fn/maint-mkdtemp-compat'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-02
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
