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
/
t0040-parse-options.sh
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 '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 'jc/pack-objects-bigfile' 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-13
Junio C Hamano
Merge branch 'jc/rev-list-options-fix' into maint
blob
|
commitdiff
|
raw
2011-04-13
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink' into maint
blob
|
commitdiff
|
raw
2011-04-12
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink'
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
Merge branch 'mg/rev-list-n-reverse-doc' into 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-03
Junio C Hamano
Merge branch 'jc/index-update-if-able' into maint
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'lt/default-abbrev' into maint
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary' into...
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'mm/maint-log-n-with-diff-filtering' into...
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'jk/format-patch-multiline-header' into...
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'jn/maint-instaweb-plack-fix' into maint
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'lp/config-vername-check' into maint
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 'ab/i18n-st'
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'nd/index-doc' into maint
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'pk/stash-apply-status-relative' into...
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter' into maint
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'js/maint-stash-index-copy' into maint
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'mg/doc-bisect-tweak-worktree' into maint
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'jh/maint-do-not-track-non-branches' into...
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'fk/maint-cvsimport-early-failure' into...
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'jc/maint-apply-report-offset' into maint
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'jc/maint-apply-no-double-patch' into...
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink' into maint
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge "checkout ambiguous ref bugfix" into maint
blob
|
commitdiff
|
raw
2011-03-30
Junio C Hamano
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
blob
|
commitdiff
|
raw
2011-03-29
Junio C Hamano
Merge branch 'jc/fetch-progressive-stride'
blob
|
commitdiff
|
raw
2011-03-29
Junio C Hamano
Merge branches 'sp/maint-fetch-pack-stop-early' and...
blob
|
commitdiff
|
raw
2011-03-27
Junio C Hamano
Merge branch 'mg/rev-list-n-parents'
blob
|
commitdiff
|
raw
2011-03-27
Junio C Hamano
Merge branch 'jc/index-update-if-able'
blob
|
commitdiff
|
raw
2011-03-27
Junio C Hamano
Merge branch 'jc/maint-rerere-in-workdir'
blob
|
commitdiff
|
raw
2011-03-27
Junio C Hamano
Merge branch 'nd/index-doc'
blob
|
commitdiff
|
raw
2011-03-27
Junio C Hamano
Merge branch 'jc/fetch-progressive-stride'
blob
|
commitdiff
|
raw
2011-03-26
Junio C Hamano
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
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 'lt/default-abbrev'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'pk/stash-apply-status-relative'
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 'pw/p4'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'mg/rev-list-one-side-only'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'js/maint-stash-index-copy'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'mg/doc-bisect-tweak-worktree'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'sp/maint-upload-pack-stop-early'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'sp/maint-fetch-pack-stop-early'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-fetch-alt'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'sg/complete-symmetric-diff'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
blob
|
commitdiff
|
raw
2011-03-21
Junio C Hamano
Merge branch 'sp/maint-fd-limit' into maint
blob
|
commitdiff
|
raw
2011-03-21
Junio C Hamano
Merge branch 'mr/hpux' into maint
blob
|
commitdiff
|
raw
2011-03-21
Junio C Hamano
Merge branch 'so/submodule-no-update-first-time' into...
blob
|
commitdiff
|
raw
2011-03-21
Junio C Hamano
Merge branch 'mo/perl-bidi-pipe-envfix' into maint
blob
|
commitdiff
|
raw
2011-03-21
Junio C Hamano
Merge branch 'ae/better-template-failure-report' into...
blob
|
commitdiff
|
raw
2011-03-20
Junio C Hamano
Merge branch 'mm/maint-log-n-with-diff-filtering'
blob
|
commitdiff
|
raw
2011-03-20
Junio C Hamano
Merge branch 'mg/rev-list-n-reverse-doc'
blob
|
commitdiff
|
raw
2011-03-20
Junio C Hamano
Merge branch 'ab/i18n-basic'
blob
|
commitdiff
|
raw
2011-03-20
Junio C Hamano
Merge branch 'uk/ls-remote-in-get-remote-url'
blob
|
commitdiff
|
raw
2011-03-20
Junio C Hamano
Merge branch 'ss/mergetool--lib'
blob
|
commitdiff
|
raw
2011-03-20
Junio C Hamano
Merge branch 'jn/status-translatable'
blob
|
commitdiff
|
raw
2011-03-20
Junio C Hamano
Merge branch 'jk/trace-sifter'
blob
|
commitdiff
|
raw
2011-03-20
Junio C Hamano
Merge branch 'jk/format-patch-multiline-header'
blob
|
commitdiff
|
raw
2011-03-20
Junio C Hamano
Merge branch 'jk/merge-rename-ux'
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'jn/maint-commit-missing-template' into...
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'lt/rename-no-extra-copy-detection' into...
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'jk/diffstat-binary' into maint
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'mg/maint-difftool-vim-readonly' into...
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'jn/test-terminal-punt-on-osx-breakage...
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'jk/fail-null-clone' into maint
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'jh/push-default-upstream-configname'...
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'mg/placeholders-are-lowercase' into maint
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'nd/struct-pathspec'
blob
|
commitdiff
|
raw
2011-03-15
Junio C Hamano
Merge branch 'jk/strbuf-vaddf'
blob
|
commitdiff
|
raw
2011-03-15
Junio C Hamano
Merge branch 'jn/maint-instaweb-plack-fix'
blob
|
commitdiff
|
raw
2011-03-15
Junio C Hamano
Merge branch 'sp/maint-fd-limit'
blob
|
commitdiff
|
raw
2011-03-15
Junio C Hamano
Merge branch 'jc/checkout-orphan-warning'
blob
|
commitdiff
|
raw
2011-03-15
Junio C Hamano
Merge branch 'jh/maint-do-not-track-non-branches'
blob
|
commitdiff
|
raw
2011-03-15
Junio C Hamano
Merge branch 'fk/maint-cvsimport-early-failure'
blob
|
commitdiff
|
raw
2011-03-15
Junio C Hamano
Merge branch 'jc/maint-apply-report-offset'
blob
|
commitdiff
|
raw
2011-03-15
Junio C Hamano
Merge branch 'jc/maint-apply-no-double-patch'
blob
|
commitdiff
|
raw
2011-03-15
Junio C Hamano
Merge branch 'mr/hpux'
blob
|
commitdiff
|
raw
2011-03-14
Junio C Hamano
Merge branch 'sp/maint-smart-http-sans-100-continue'
blob
|
commitdiff
|
raw
2011-03-13
Junio C Hamano
Merge branch 'pw/p4'
blob
|
commitdiff
|
raw
2011-03-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-03-09
Junio C Hamano
Merge branch 'js/cherry-pick-usability'
blob
|
commitdiff
|
raw
2011-03-09
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink'
blob
|
commitdiff
|
raw
2011-03-09
Junio C Hamano
Merge branch 'so/submodule-no-update-first-time'
blob
|
commitdiff
|
raw
2011-03-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-03-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-03-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-03-04
Junio C Hamano
Merge branch 'mh/p4'
blob
|
commitdiff
|
raw
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
