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
/
lib-httpd
/
2011-05-13
Junio C Hamano
Merge branch 'jk/merge-one-file-working-tree' into...
tree
|
commitdiff
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-diff-files-unmerged' into maint
tree
|
commitdiff
2011-05-04
Junio C Hamano
Merge branch 'sp/maint-clear-postfields' into maint
tree
|
commitdiff
2011-04-29
Junio C Hamano
Merge branch 'mg/x-years-12-months' into maint
tree
|
commitdiff
2011-04-11
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
tree
|
commitdiff
2011-04-03
Junio C Hamano
Merge branch 'jc/index-update-if-able' into maint
tree
|
commitdiff
2011-04-03
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary' into...
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'nd/index-doc' into maint
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter' into maint
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'mg/doc-bisect-tweak-worktree' into maint
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'jh/maint-do-not-track-non-branches' into...
tree
|
commitdiff
2011-03-27
Junio C Hamano
Merge branch 'jc/index-update-if-able'
tree
|
commitdiff
2011-03-27
Junio C Hamano
Merge branch 'jc/maint-rerere-in-workdir'
tree
|
commitdiff
2011-03-27
Junio C Hamano
Merge branch 'nd/index-doc'
tree
|
commitdiff
2011-03-26
Junio C Hamano
Merge git-gui 0.14.0
tree
|
commitdiff
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter'
tree
|
commitdiff
2011-03-23
Junio C Hamano
Merge branch 'mg/doc-bisect-tweak-worktree'
tree
|
commitdiff
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary'
tree
|
commitdiff
2011-03-16
Junio C Hamano
Merge branch 'jk/diffstat-binary' into maint
tree
|
commitdiff
2011-03-16
Junio C Hamano
Merge branch 'jn/test-terminal-punt-on-osx-breakage...
tree
|
commitdiff
2011-03-15
Junio C Hamano
Merge branch 'jh/maint-do-not-track-non-branches'
tree
|
commitdiff
2011-03-14
Junio C Hamano
Merge branch 'sp/maint-smart-http-sans-100-continue'
tree
|
commitdiff
2011-03-04
Junio C Hamano
Merge branch 'jk/diffstat-binary'
tree
|
commitdiff
2011-03-04
Junio C Hamano
Merge branch 'jn/test-terminal-punt-on-osx-breakage'
tree
|
commitdiff
2011-02-28
Junio C Hamano
Merge branch 'sp/maint-smart-http-sans-100-continue'
tree
|
commitdiff
2011-02-26
Jonathan Nieder
Merge commit 'jn/svn-fe' of git://github.com/gitster...
tree
|
commitdiff
2011-02-16
Junio C Hamano
Merge branch 'maint-1.7.2' into maint-1.7.3
tree
|
commitdiff
2011-02-10
Junio C Hamano
Merge branch 'tr/merge-unborn-clobber'
tree
|
commitdiff
2011-02-10
Junio C Hamano
Merge branch 'cb/setup'
tree
|
commitdiff
2011-02-10
Junio C Hamano
Merge branch 'maint-1.7.0' into maint
tree
|
commitdiff
2011-01-31
Junio C Hamano
Merge branch 'jl/fetch-submodule-recursive' into maint
tree
|
commitdiff
2011-01-27
Junio C Hamano
Merge branch 'jn/fast-import-empty-tree-removal' into...
tree
|
commitdiff
2011-01-19
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc' into maint
tree
|
commitdiff
2011-01-19
Junio C Hamano
Merge branch 'tr/submodule-relative-scp-url' into maint
tree
|
commitdiff
2011-01-19
Junio C Hamano
Merge branch 'rj/maint-difftool-cygwin-workaround'...
tree
|
commitdiff
2011-01-19
Junio C Hamano
Merge branch 'rj/maint-test-fixes' into maint
tree
|
commitdiff
2011-01-19
Junio C Hamano
Merge branch 'jn/maint-gitweb-pathinfo-fix' into maint
tree
|
commitdiff
2011-01-19
Junio C Hamano
Merge branch 'ak/describe-exact' into maint
tree
|
commitdiff
2011-01-19
Junio C Hamano
Merge branch 'jn/maint-fast-import-object-reuse' into...
tree
|
commitdiff
2011-01-19
Junio C Hamano
Merge branch 'jn/submodule-b-current' into maint
tree
|
commitdiff
2011-01-19
Junio C Hamano
Merge branch 'jc/maint-svn-info-test-fix' into maint
tree
|
commitdiff
2011-01-19
Junio C Hamano
Merge branch 'nd/maint-relative' into maint
tree
|
commitdiff
2011-01-13
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc'
tree
|
commitdiff
2011-01-13
Junio C Hamano
Merge branch 'tr/submodule-relative-scp-url'
tree
|
commitdiff
2011-01-10
Junio C Hamano
Merge branch 'maint-1.7.2' into maint
tree
|
commitdiff
2011-01-05
Junio C Hamano
Merge branch 'jn/svn-fe' (early part)
tree
|
commitdiff
2011-01-05
Junio C Hamano
Merge branch 'ao/t9001-fix'
tree
|
commitdiff
2011-01-05
Junio C Hamano
Merge branch 'mg/cvsimport'
tree
|
commitdiff
2010-12-28
Junio C Hamano
Merge branch 'kb/maint-status-cquote' into maint
tree
|
commitdiff
2010-12-28
Junio C Hamano
Merge branch 'nd/setup'
tree
|
commitdiff
2010-12-26
Junio C Hamano
Merge branch 'rs/maint-diff-fd-leak' into maint
tree
|
commitdiff
2010-12-23
Junio C Hamano
Merge branch 'rj/maint-difftool-cygwin-workaround'
tree
|
commitdiff
2010-12-22
Junio C Hamano
Merge branch 'rj/maint-test-fixes'
tree
|
commitdiff
2010-12-22
Junio C Hamano
Merge branch 'pd/bash-4-completion'
tree
|
commitdiff
2010-12-22
Junio C Hamano
Merge branch 'nd/maint-fix-add-typo-detection'
tree
|
commitdiff
2010-12-22
Junio C Hamano
Merge branch 'tf/commit-list-prefix'
tree
|
commitdiff
2010-12-21
Junio C Hamano
Merge branch 'jk/maint-decorate-01-bool'
tree
|
commitdiff
2010-12-21
Junio C Hamano
Merge branch 'jn/maint-gitweb-pathinfo-fix'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'kb/diff-C-M-synonym'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'jn/fast-import-blob-access'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'jl/fetch-submodule-recursive'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'rj/msvc-fix'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'nd/extended-sha1-relpath'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'aa/status-hilite-branch'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'ak/describe-exact'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'nd/maint-relative'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'jn/maint-svn-fe'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'jc/maint-svn-info-test-fix'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'jn/submodule-b-current'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'jn/maint-fast-import-object-reuse'
tree
|
commitdiff
2010-12-16
Junio C Hamano
Merge branch 'jn/fast-import-ondemand-checkpoint'
tree
|
commitdiff
2010-12-15
Junio C Hamano
Git 1.7.3.4
v1.7.3.4
tree
|
commitdiff
2010-12-15
Junio C Hamano
Git 1.7.0.9
v1.7.0.9
tree
|
commitdiff
2010-12-15
Junio C Hamano
Git 1.6.6.3
v1.6.6.3
tree
|
commitdiff
2010-12-14
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
tree
|
commitdiff
2010-12-14
Junio C Hamano
Merge branch 'jc/maint-no-openssl-build-fix' into maint
tree
|
commitdiff
2010-12-14
Junio C Hamano
Merge branch 'ja/maint-pull-rebase-doc' into maint
tree
|
commitdiff
2010-12-14
Junio C Hamano
Merge branch 'tc/http-urls-ends-with-slash' into maint
tree
|
commitdiff
2010-12-14
Junio C Hamano
Merge branch 'nd/maint-hide-checkout-index-from-error...
tree
|
commitdiff
2010-12-14
Junio C Hamano
Merge branch 'jk/maint-reflog-bottom' into maint
tree
|
commitdiff
2010-12-14
Junio C Hamano
Merge branch 'mz/rebase-abort-reflog-fix' into maint
tree
|
commitdiff
2010-12-14
Junio C Hamano
Merge branch 'mz/maint-rebase-stat-config' into maint
tree
|
commitdiff
2010-12-14
Junio C Hamano
Merge branch 'gc/http-with-non-ascii-username-url'...
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'ja/maint-pull-rebase-doc'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'jn/parse-options-extra'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'gb/web--browse'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'js/configurable-tab'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'nd/maint-hide-checkout-index-from-error'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'jn/gitweb-per-request-config'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'ef/help-cmd-prefix'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'tc/http-urls-ends-with-slash'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'tc/format-patch-p'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'ef/win32-dirent'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'mz/rebase-i-verify'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'mz/rebase-abort-reflog-fix'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'jk/maint-reflog-bottom'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'jk/asciidoc-update'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'mz/pull-rebase-rebased'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'mz/maint-rebase-stat-config'
tree
|
commitdiff
2010-12-13
Junio C Hamano
Merge branch 'jn/git-cmd-h-bypass-setup'
tree
|
commitdiff
next