tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
merge, pull: introduce '--(no-)stat' option
[git.git]
/
builtin-merge-recursive.c
2008-04-12
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-12
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-10
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-09
Junio C Hamano
Merge branch 'jc/rename'
blob
|
commitdiff
|
raw
2008-04-09
Junio C Hamano
Merge branch 'mk/unpack-careful'
blob
|
commitdiff
|
raw
2008-04-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-04-07
Junio C Hamano
Merge branch 'jc/maint-apply-match-beginning'
blob
|
commitdiff
|
raw
2008-04-05
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-04-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-03-28
Junio C Hamano
GIT 1.5.5-rc2
v1.5.5-rc2
blob
|
commitdiff
|
raw
2008-03-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-26
Junio C Hamano
Merge branch 'jc/maint-fetch-regression-1.5.4'
blob
|
commitdiff
|
raw
2008-03-23
Junio C Hamano
Merge branch 'git-p4' of git://repo.or.cz/git/git-p4
blob
|
commitdiff
|
raw
2008-03-17
Junio C Hamano
Merge branch 'jc/makefile'
blob
|
commitdiff
|
raw
2008-03-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-16
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-03-15
Junio C Hamano
Merge branch 'jk/portable'
blob
|
commitdiff
|
raw
2008-03-15
Junio C Hamano
Merge branch 'py/submodule'
blob
|
commitdiff
|
raw
2008-03-15
Junio C Hamano
Merge branch 'cc/help'
blob
|
commitdiff
|
raw
2008-03-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-03-14
Junio C Hamano
Merge branch 'mr/autoconf-fread'
blob
|
commitdiff
|
raw
2008-03-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
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-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-11
Junio C Hamano
Merge branch 'jc/cherry-pick' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2008-03-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-09
Linus Torvalds
Make 'unpack_trees()' have a separate source and destin...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-09
Linus Torvalds
Make 'unpack_trees()' take the index to work on as...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-09
Junio C Hamano
Merge branch 'kb/maint-filter-branch-disappear'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-09
Junio C Hamano
Merge branch 'maint' to sync with 1.5.4.4
blob
|
commitdiff
|
raw
|
diff to current
2008-03-08
Junio C Hamano
Merge branch 'aw/maint-shortlog-blank-lines'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-03
Junio C Hamano
Merge commit '74359821' into js/reflog-delete
blob
|
commitdiff
|
raw
|
diff to current
2008-03-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-02
Junio C Hamano
Merge branch 'pb/cvsimport'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-02
Junio C Hamano
Merge branch 'jc/maint-log-merge-left-right'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-02
Junio C Hamano
Merge branch 'mh/maint-http-proxy-fix'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-02
Junio C Hamano
Merge branch 'cb/http-test'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-02
Junio C Hamano
Merge branch 'jc/remote-multi-url'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-02
Junio C Hamano
Merge branch 'jn/gitweb-grep'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-02
Junio C Hamano
Merge branch 'mk/maint-parse-careful'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-02
Junio C Hamano
Merge branch 'sb/describe-long'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-02
Junio C Hamano
Merge branch 'ew/maint-svn-cert-fileprovider'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-02
Junio C Hamano
Merge branch 'js/maint-daemon'
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'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-27
Junio C Hamano
Merge branch 'git-p4' of git://repo.or.cz/git/git-p4
blob
|
commitdiff
|
raw
|
diff to current
2008-02-27
Junio C Hamano
Merge branch 'jm/free'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-27
Junio C Hamano
Merge branch 'js/branch-track'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-27
Junio C Hamano
Merge branch 'db/checkout'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-10
Daniel Barkalow
Library function to check for unmerged index entries
blob
|
commitdiff
|
raw
|
diff to current
2008-02-10
Daniel Barkalow
Build-in merge-recursive
blob
|
commitdiff
|
raw
|
diff to current