tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
tests: consolidate CR removal/addition functions
[git.git]
/
t
/
t3030-merge-recursive.sh
2010-01-25
Junio C Hamano
Merge branch 'jc/fix-tree-walk'
blob
|
commitdiff
|
raw
2010-01-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-24
Junio C Hamano
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Junio C Hamano
Merge branch 'doc-style/for-next' of git://repo.or...
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'jc/branch-d'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'il/rev-glob'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'js/refer-upstream'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'jl/submodule-diff'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'il/remote-updates'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'il/branch-set-upstream'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'jc/maint-limit-note-output'
blob
|
commitdiff
|
raw
2010-01-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'bw/cvsimport'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'jc/checkout-merge-base'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'ag/patch-header-verify'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'jc/conflict-marker-size'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'ag/maint-apply-too-large-p'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'ap/merge-backend-opts'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'nd/status-partial-refresh'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge remote branch 'remotes/trast-doc/for-next'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'jh/notes' (early part)
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-20
Junio C Hamano
Merge branch 'rr/core-tutorial'
blob
|
commitdiff
|
raw
2010-01-20
Junio C Hamano
Merge branch 'jc/cache-unmerge'
blob
|
commitdiff
|
raw
2010-01-20
Junio C Hamano
Merge branch 'js/exec-error-report'
blob
|
commitdiff
|
raw
2010-01-20
Junio C Hamano
Merge branch 'jc/ls-files-ignored-pathspec'
blob
|
commitdiff
|
raw
2010-01-20
Junio C Hamano
Merge branch 'jc/grep-lookahead'
blob
|
commitdiff
|
raw
2010-01-20
Junio C Hamano
Merge branch 'jc/maint-strbuf-add-fix-doubling'
blob
|
commitdiff
|
raw
2010-01-20
Junio C Hamano
Merge branch 'mm/conflict-advice'
blob
|
commitdiff
|
raw
2010-01-19
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2010-01-17
Junio C Hamano
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-12
Matthieu Moy
Be more user-friendly when refusing to do something...
blob
|
commitdiff
|
raw
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-31
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-30
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-27
Junio C Hamano
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-09
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-12-09
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'jc/maint-am-keep' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'np/maint-sideband-favor-status' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Junio C Hamano
Merge branch 'jc/maint-am-keep'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-18
Junio C Hamano
Merge branch 'np/maint-sideband-favor-status'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-i'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-24
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-19
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-19
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-04
Junio C Hamano
Merge branch 'jc/maint-1.6.4-show-branch-default' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge branch 'tf/diff-whitespace-incomplete-line' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2009-09-01
Junio C Hamano
Merge branch 'tf/diff-whitespace-incomplete-line'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
commitdiff
|
raw
|
diff to current
2009-08-26
Junio C Hamano
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-22
Junio C Hamano
Merge branch 'cc/replace'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-21
Junio C Hamano
Merge branch 'jc/maint-merge-recursive-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-08-19
Junio C Hamano
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-16
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-08-11
Junio C Hamano
Merge branch 'jc/maint-merge-recursive-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-08
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2009-08-05
Junio C Hamano
Merge branch 'ne/futz-upload-pack'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-29
Junio C Hamano
Merge branch 'hv/cvsps-tests'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-09
Junio C Hamano
Merge branch 'ml/http'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-08
Junio C Hamano
Merge branch 'cb/maint-fetch-refspec-wo-dst' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-07-06
Junio C Hamano
Merge branch 'tr/die_errno'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-06
Junio C Hamano
Merge branch 'cb/maint-fetch-refspec-wo-dst'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-06
Junio C Hamano
Merge branch 'gb/am-foreign'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-06
Junio C Hamano
Merge branch 'uk/rev-parse-parse-opt'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-02
Junio C Hamano
Merge branch 'cc/bisect'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-02
Junio C Hamano
Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'ak/maint-for-each-ref-no-lookup' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'rc/maint-http-local-slot-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'cb/maint-no-double-merge' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'ph/submodule-rebase'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'jc/cache-tree'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'mg/pushurl'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'mn/maint-iconv-autoconf'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'sb/pull-rebase'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'pb/maint-1.6.2-userdiff-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'sb/maint-1.6.0-add-config-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'lt/maint-unsigned-left-shift'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-20
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-06-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-18
Junio C Hamano
Merge branch 'sb/parse-options-integer'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-18
Junio C Hamano
Merge branch 'ak/maint-for-each-ref-no-lookup'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'mh/fix-send-email-threaded'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'rc/http-push'
blob
|
commitdiff
|
raw
|
diff to current
next