tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge branch 'mh/cherry-default'
[git.git]
/
Documentation
/
howto
/
revert-a-faulty-merge.txt
2009-01-13
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-fix' into maint
blob
|
commitdiff
|
raw
2009-01-13
Junio C Hamano
Merge branch 'ap/maint-apply-modefix' into maint
blob
|
commitdiff
|
raw
2009-01-13
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-12
Junio C Hamano
Merge branch 'jc/maint-do-not-switch-to-non-commit...
blob
|
commitdiff
|
raw
2009-01-07
Junio C Hamano
Merge branch 'mk/gitweb-feature'
blob
|
commitdiff
|
raw
2009-01-07
Junio C Hamano
Merge branch 'cb/merge-recursive-fix'
blob
|
commitdiff
|
raw
2009-01-07
Junio C Hamano
Merge branch 'mv/um-pdf'
blob
|
commitdiff
|
raw
2009-01-07
Junio C Hamano
Merge branch 'jn/gitweb-blame'
blob
|
commitdiff
|
raw
2009-01-07
Junio C Hamano
Merge branch 'wp/add-p-goto'
blob
|
commitdiff
|
raw
2009-01-07
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-03
Junio C Hamano
Merge branch 'jc/maint-do-not-switch-to-non-commit'
blob
|
commitdiff
|
raw
2009-01-03
Junio C Hamano
Merge branch 'ap/maint-apply-modefix'
blob
|
commitdiff
|
raw
2009-01-01
Junio C Hamano
Merge branch 'cb/mergetool'
blob
|
commitdiff
|
raw
2008-12-29
Junio C Hamano
Merge branch 'lt/reset-merge'
blob
|
commitdiff
|
raw
2008-12-29
Junio C Hamano
Merge branch 'np/auto-thread'
blob
|
commitdiff
|
raw
2008-12-27
Junio C Hamano
Merge branch 'sp/maint-describe-all-tag-warning' into...
blob
|
commitdiff
|
raw
2008-12-24
Junio C Hamano
Merge branch 'js/rebase-i-p'
blob
|
commitdiff
|
raw
2008-12-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-12-21
Nanako Shiraishi
Add a documentat on how to revert a faulty merge
blob
|
commitdiff
|
raw