tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
merge: make branch.<name>.mergeoptions correctly override merge.<option>
[git.git]
/
t
/
t7500-commit.sh
2010-02-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Sync with 1.6.6.2
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
blob
|
commitdiff
|
raw
|
diff to current
2010-02-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-08
Junio C Hamano
Merge branch 'jc/maint-imap-config-parse' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-08
Junio C Hamano
Merge branch 'jc/maint-doc-git-add-example' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-07
Junio C Hamano
Merge git://repo.or.cz/git-gui
v1.7.0-rc2
blob
|
commitdiff
|
raw
2010-02-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-06
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-02-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-03
Junio C Hamano
Merge branch 'ms/filter-branch-submodule'
blob
|
commitdiff
|
raw
2010-02-03
Junio C Hamano
Merge branch 'sp/fast-import-large-blob'
blob
|
commitdiff
|
raw
2010-01-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-29
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-01-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-28
Junio C Hamano
Merge branch 'fk/threaded-grep'
blob
|
commitdiff
|
raw
2010-01-28
Junio C Hamano
Merge branch 'gp/maint-cvsserver'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'jc/upstream-reflog'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'jc/maint-reflog-bad-timestamp'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'il/maint-colon-address'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'il/maint-xmallocz'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'jh/maint-config-file-prefix'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'jl/diff-submodule-ignore'
blob
|
commitdiff
|
raw
2010-01-26
Stephen Boyd
fix portability issues with $ in double quotes
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-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-10
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
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-30
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
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.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
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-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-08
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2009-08-08
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
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-06
Junio C Hamano
Merge branch 'gb/am-foreign'
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-22
Junio C Hamano
Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
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 '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-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 'ak/maint-for-each-ref-no-lookup'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-14
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-14
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2009-06-14
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'rc/http-push'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'cc/bisect' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'rc/maint-http-local-slot-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'cb/maint-no-double-merge'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'ph/submodule-rebase' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'bc/solaris'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'cb/match_refs_internal_tail'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'nw/maint-cvsexportcommit'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
