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
/
t5001-archive-attr.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.1' into maint-1.7.2
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-19
Junio C Hamano
Merge branch 'nd/maint-relative' into maint
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.1' into maint-1.7.2
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 'nd/maint-relative'
blob
|
commitdiff
|
raw
2010-12-16
Junio C Hamano
Merge branch 'jn/maint-svn-fe'
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.2.5
v1.7.2.5
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 'jk/maint-reflog-bottom' into maint
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 'jk/maint-reflog-bottom'
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-08
Junio C Hamano
Merge branch 'jh/notes-merge'
blob
|
commitdiff
|
raw
2010-12-04
Junio C Hamano
Merge branch 'jj/icase-directory'
blob
|
commitdiff
|
raw
2010-12-02
Junio C Hamano
Git 1.7.2.4
v1.7.2.4
blob
|
commitdiff
|
raw
2010-12-02
Junio C Hamano
Merge branch 'cb/maint-orphan-merge-noclobber' into...
blob
|
commitdiff
|
raw
2010-12-02
Junio C Hamano
Merge branch 'maint-1.7.1' into maint-1.7.2
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 'cb/maint-orphan-merge-noclobber'
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'aw/git-p4-deletion' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'kf/post-receive-sample-hook' 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 'kf/post-receive-sample-hook'
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-29
Junio C Hamano
Merge branch 'gb/shell-ext'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'rr/fmt-merge-msg'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'po/etc-gitattributes'
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 branch 'ch/maint-cannot-create-bundle-error'
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 'kf/askpass-config'
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 'jk/maint-pass-c-config-in-env'
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 'jh/clean-exclude'
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 'jl/submodule-ignore-diff'
blob
|
commitdiff
|
raw
2010-09-04
Junio C Hamano
Merge branch 'ab/test-2'
blob
|
commitdiff
|
raw
2010-09-04
Junio C Hamano
Merge branch 'js/detached-stash'
blob
|
commitdiff
|
raw
2010-09-04
Junio C Hamano
Merge branch 'js/maint-reflog-beyond-horizon'
blob
|
commitdiff
|
raw
2010-09-04
Junio C Hamano
Merge branch 'dg/local-mod-error-messages'
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 'ab/compat-regex'
blob
|
commitdiff
|
raw
2010-09-03
Junio C Hamano
Merge branch 'jn/maint-doc-user-manual-html-doctype'
blob
|
commitdiff
|
raw
2010-09-03
Junio C Hamano
Merge branch 'cb/maint-mergetool-no-tty'
blob
|
commitdiff
|
raw
2010-09-03
Junio C Hamano
Merge branch 'jn/apply-filename-with-sp'
blob
|
commitdiff
|
raw
2010-09-03
Junio C Hamano
Merge branch 'jn/merge-custom-no-trivial'
blob
|
commitdiff
|
raw
2010-09-03
Junio C Hamano
Merge branch 'jn/update-contrib-example-merge'
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 'dj/fetch-tagopt' into maint
blob
|
commitdiff
|
raw
2010-09-01
Junio C Hamano
Merge branch 'da/fix-submodule-sync-superproject-config...
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 'da/fix-submodule-sync-superproject-config'
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'jn/cherry-revert-message-clean-up'
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'cb/binary-patch-id'
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'dj/fetch-tagopt'
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 'jn/svn-fe'
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'tr/maint-no-unquote-plus'
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'jn/paginate-fix'
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'jn/maint-setup-fix'
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'en/fast-export-fix'
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'hv/autosquash-config'
blob
|
commitdiff
|
raw
2010-08-31
Junio C Hamano
Merge branch 'sg/rerere-gc-old-still-used'
blob
|
commitdiff
|
raw
2010-08-30
Junio C Hamano
Merge branch 'maint-1.7.1' into maint
blob
|
commitdiff
|
raw
2010-08-22
Junio C Hamano
Merge branch 'mm/rebase-i-exec'
blob
|
commitdiff
|
raw
2010-08-22
Junio C Hamano
Merge branch 'gb/split-cmdline-errmsg'
blob
|
commitdiff
|
raw
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
