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 'jl/submodule-ignore-diff'
[git.git]
/
t
/
t6038-merge-text-auto.sh
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 'nd/clone-depth-zero'
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 'jc/maint-doc-em-dash'
blob
|
commitdiff
|
raw
2010-09-03
Junio C Hamano
Merge branch 'mg/doc-bundle'
blob
|
commitdiff
|
raw
2010-09-03
Junio C Hamano
Merge branch 'jn/doc-backslash'
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-08-06
Jonathan Nieder
t6038 (merge.renormalize): check that it can be turned off
blob
|
commitdiff
|
raw
2010-08-06
Jonathan Nieder
t6038 (merge.renormalize): try checkout -m and cherry...
blob
|
commitdiff
|
raw
|
diff to current
2010-08-06
Jonathan Nieder
t6038 (merge.renormalize): style nitpicks
blob
|
commitdiff
|
raw
|
diff to current
2010-07-02
Eyvind Bernhardsen
Try normalizing files to avoid delete/modify conflicts...
blob
|
commitdiff
|
raw
|
diff to current
2010-07-02
Eyvind Bernhardsen
Avoid conflicts when merging branches with mixed normal...
blob
|
commitdiff
|
raw
|
diff to current
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
