tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
add function check_ok_to_remove()
[git.git]
/
t
/
t6038-merge-text-auto.sh
2010-10-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'jk/repack-reuse-object'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'bc/fix-cherry-pick-root'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'uk/fix-author-ident-sed-script'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'cw/gitweb-hilite-config'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'ab/makefile-track-cc'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'mg/reset-doc'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'work/pt/for-junio' of git://repo.or.cz...
blob
|
commitdiff
|
raw
2010-10-03
Eric Sunshine
Side-step sed line-ending "corruption" leading to t6038...
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'tr/send-email-refuse-sending-unedited...
blob
|
commitdiff
|
raw
|
diff to current
2010-09-29
Junio C Hamano
Merge branch 'jc/grep-header-all-match-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-29
Junio C Hamano
Merge branch 'rr/format-patch-count-without-merges'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-29
Junio C Hamano
Merge branch 'jc/pickaxe-grep'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-29
Junio C Hamano
Merge branch 'gb/shell-ext'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-29
Junio C Hamano
Merge branch 'rr/fmt-merge-msg'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-29
Junio C Hamano
Merge branch 'po/etc-gitattributes'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-18
Junio C Hamano
Merge branch 'js/ls-files-x-doc'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-15
Junio C Hamano
Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-15
Junio C Hamano
Merge branch 'os/fix-rebase-diff-no-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-15
Junio C Hamano
Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-15
Junio C Hamano
Merge branch 'ch/maint-cannot-create-bundle-error'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-15
Junio C Hamano
Merge branch 'ks/recursive-rename-add-identical'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2010-09-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'tf/cleanup-builtin-help-headers'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'jk/test-must-fail-missing'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'jh/error-removing-missing-note'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'kf/askpass-config'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'bc/maint-fetch-url-only'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'jk/maint-pass-c-config-in-env'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-06
Junio C Hamano
Merge branch 'jh/clean-exclude'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-06
Junio C Hamano
Merge branch 'jl/maint-fix-test'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-06
Junio C Hamano
Merge branch 'maint'
v1.7.3-rc0
blob
|
commitdiff
|
raw
|
diff to current
2010-09-04
Junio C Hamano
Merge branch 'jl/submodule-ignore-diff'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-04
Junio C Hamano
Merge branch 'ab/test-2'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-04
Junio C Hamano
Merge branch 'js/detached-stash'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-04
Junio C Hamano
Merge branch 'js/maint-reflog-beyond-horizon'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-04
Junio C Hamano
Merge branch 'dg/local-mod-error-messages'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-04
Junio C Hamano
Merge branch 'nd/maint-fix-replace'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-03
Junio C Hamano
Merge branch 'ab/compat-regex'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-03
Junio C Hamano
Merge branch 'nd/clone-depth-zero'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-03
Junio C Hamano
Merge branch 'jn/maint-doc-user-manual-html-doctype'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-03
Junio C Hamano
Merge branch 'cb/maint-mergetool-no-tty'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-03
Junio C Hamano
Merge branch 'jn/apply-filename-with-sp'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-03
Junio C Hamano
Merge branch 'jn/merge-custom-no-trivial'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-03
Junio C Hamano
Merge branch 'jc/maint-doc-em-dash'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-03
Junio C Hamano
Merge branch 'mg/doc-bundle'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-03
Junio C Hamano
Merge branch 'jn/doc-backslash'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-03
Junio C Hamano
Merge branch 'jn/update-contrib-example-merge'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-03
Junio C Hamano
Merge branch 'jn/merge-renormalize'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-06
Jonathan Nieder
t6038 (merge.renormalize): check that it can be turned off
blob
|
commitdiff
|
raw
|
diff to current
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}
