projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Add a demonstration/test of customized merge.
[git]
/
t
/
t4113-apply-ending.sh
2007-03-22
Junio C Hamano
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2007-03-20
Junio C Hamano
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2007-03-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2007-03-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-03-06
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-02-25
Junio C Hamano
Merge git://repo.or.cz/git-gui into maint
blob
|
commitdiff
|
raw
2007-02-21
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-02-18
Junio C Hamano
Merge git://git./pub/scm/gitk/gitk into maint
blob
|
commitdiff
|
raw
2007-02-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2007-02-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2007-02-12
Junio C Hamano
Merge git-gui
blob
|
commitdiff
|
raw
2007-01-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-11-29
Junio C Hamano
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-11-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-09-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-08-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-06-18
Junio C Hamano
Merge early part of branch 'jc/fetchupload'
blob
|
commitdiff
|
raw
2006-06-18
Junio C Hamano
Merge branch 'jc/rw-prefix'
blob
|
commitdiff
|
raw
2006-06-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-06-10
Junio C Hamano
Merge git://git.kernel.org/pub/scm/git/gitweb
blob
|
commitdiff
|
raw
2006-06-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-06-04
Junio C Hamano
Merge branch 'new' of git://git./gitk/gitk into next
blob
|
commitdiff
|
raw
2006-06-04
Junio C Hamano
Merge branch 'sp/reflog'
blob
|
commitdiff
|
raw
2006-06-02
Junio C Hamano
Merge branch 'nh/http'
blob
|
commitdiff
|
raw
2006-06-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-06-01
Junio C Hamano
Merge branch 'nh/http' into next
blob
|
commitdiff
|
raw
2006-05-31
Junio C Hamano
Merge branch 'sp/reflog' into next
blob
|
commitdiff
|
raw
2006-05-30
Junio C Hamano
Merge branch 'ew/tests'
blob
|
commitdiff
|
raw
2006-05-30
Junio C Hamano
Merge branch 'jc/lt-tree-n-cache-tree' into lt/tree-2
blob
|
commitdiff
|
raw
2006-05-29
Junio C Hamano
Merge branch 'jc/lt-tree-n-cache-tree' into next
blob
|
commitdiff
|
raw
2006-05-29
Junio C Hamano
Merge branch 'lt/apply'
blob
|
commitdiff
|
raw
2006-05-28
Junio C Hamano
Merge branch 'jc/cache-tree' into next
blob
|
commitdiff
|
raw
2006-05-28
Junio C Hamano
Merge branch 'master' into next
blob
|
commitdiff
|
raw
2006-05-26
Junio C Hamano
Merge branch 'master' into next
blob
|
commitdiff
|
raw
2006-05-26
Junio C Hamano
Merge branch 'eb/mailinfo' into next
blob
|
commitdiff
|
raw
2006-05-26
Junio C Hamano
Merge branch 'ew/tests' into next
blob
|
commitdiff
|
raw
2006-05-25
Junio C Hamano
Merge branch 'sp/reflog' into next
blob
|
commitdiff
|
raw
2006-05-25
Junio C Hamano
Merge branch 'jc/fetchupload' into next
blob
|
commitdiff
|
raw
2006-05-24
Junio C Hamano
Merge branch 'sp/reflog' into next
blob
|
commitdiff
|
raw
2006-05-24
Junio C Hamano
Merge branch 'lt/apply' into next
blob
|
commitdiff
|
raw
2006-05-24
Junio C Hamano
Merge branch 'master' into lt/apply
blob
|
commitdiff
|
raw
2006-05-24
Junio C Hamano
apply: force matching at the beginning.
blob
|
commitdiff
|
raw
2006-05-24
Catalin Marinas
Add a test-case for git-apply trying to add an ending...
blob
|
commitdiff
|
raw
|
diff to current