tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
diff-options.txt: Fix asciidoc markup issue
[git.git]
/
merge-tree.c
2008-10-09
Shawn O. Pearce
Merge branch 'dp/cywginstat'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'lt/time-reject-fractional-seconds'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'jc/add-ita'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'mw/sendemail'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'mv/merge-refresh'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'ph/parseopt'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'rz/grepz'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'mg/verboseprune'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-08
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-08
Brandon Casey
Replace xmalloc/memset(0) pairs with xcalloc
blob
|
commitdiff
|
raw
2008-09-25
Shawn O. Pearce
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-09-07
Junio C Hamano
Merge updated git-gui and gitk that call each other
blob
|
commitdiff
|
raw
|
diff to current
2008-09-06
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-17
Junio C Hamano
Merge git-gui 0.11.0
blob
|
commitdiff
|
raw
|
diff to current
2008-08-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-08-06
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-08-06
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-07-30
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-07-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-07-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-07-06
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-06-27
Junio C Hamano
Merge branch 'maint-1.5.4' into maint-1.5.5
blob
|
commitdiff
|
raw
|
diff to current
2008-06-11
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-05-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-05-26
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-05-24
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-05-23
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
v1.5.5.2
blob
|
commitdiff
|
raw
|
diff to current
2008-05-21
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-05-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-05-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-05-14
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-05-11
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-05-09
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-05-04
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-30
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-28
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-25
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-23
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-19
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-17
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-16
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-12
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-12
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-10
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-09
Junio C Hamano
Merge branch 'jc/rename'
blob
|
commitdiff
|
raw
|
diff to current
2008-04-09
Junio C Hamano
Merge branch 'mk/unpack-careful'
blob
|
commitdiff
|
raw
|
diff to current
2008-04-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-04-07
Junio C Hamano
Merge branch 'jc/maint-apply-match-beginning'
blob
|
commitdiff
|
raw
|
diff to current
2008-04-05
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-04-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-03-28
Junio C Hamano
GIT 1.5.5-rc2
v1.5.5-rc2
blob
|
commitdiff
|
raw
|
diff to current
2008-03-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-26
Junio C Hamano
Merge branch 'jc/maint-fetch-regression-1.5.4'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-16
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-03-15
Junio C Hamano
Merge branch 'py/submodule'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-03-14
Junio C Hamano
Merge branch 'mr/autoconf-fread'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-12
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-03-12
Junio C Hamano
Merge branch 'js/remote'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-12
Junio C Hamano
Merge branch 'lt/unpack-trees'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-09
Linus Torvalds
Make 'traverse_trees()' traverse conflicting DF entries...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-09
Linus Torvalds
Add return value to 'traverse_tree()' callback
blob
|
commitdiff
|
raw
|
diff to current
2008-03-09
Linus Torvalds
Make 'traverse_tree()' use linked structure rather...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-06
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-01
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-03-01
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-02-23
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-02-23
Junio C Hamano
Merge branch 'bc/reflog-fix' into js/reflog-delete
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-02-13
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-02-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-01-24
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-01-11
Junio C Hamano
Merge ../gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-01-09
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-01-08
Junio C Hamano
Merge in GIT 1.5.3.8
blob
|
commitdiff
|
raw
|
diff to current
2008-01-05
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-12-31
Junio C Hamano
Merge branch 'maint' of git://linux-nfs.org/~bfields/git
blob
|
commitdiff
|
raw
|
diff to current
2007-12-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-12-14
Junio C Hamano
xdl_diff: identify call sites.
blob
|
commitdiff
|
raw
|
diff to current
2007-12-07
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-11-21
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-10-28
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-10-21
Shawn O. Pearce
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-10-21
Shawn O. Pearce
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-09-18
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-08-29
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-27
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-08-26
J. Bruce Fields
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-21
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-19
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
next