tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'maint'
[git.git]
/
builtin-merge-recursive.c
2008-07-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-07-16
Junio C Hamano
Merge branch 'mv/merge-in-c'
blob
|
commitdiff
|
raw
2008-07-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-07-15
Junio C Hamano
Merge branch 'jc/branch-merged'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Junio C Hamano
Merge branch 'ph/parseopt-step-blame'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-09
Junio C Hamano
Merge branch 'jc/reflog-expire'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-08
Junio C Hamano
Merge branch 'jc/blame' (early part) into HEAD
blob
|
commitdiff
|
raw
|
diff to current
2008-07-08
Junio C Hamano
Merge branch 'lt/racy-empty' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-07-07
Junio C Hamano
Merge branch 'jc/rerere'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-07
Junio C Hamano
Merge branch 'dr/ceiling'
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-07-03
Junio C Hamano
Merge branch 'j6t/mingw'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-03
Junio C Hamano
Merge branch 'jc/maint-reset' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-07-01
Junio C Hamano
Merge branch 'ph/mergetool'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-01
Junio C Hamano
Merge branch 'jc/maint-reset'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-01
Junio C Hamano
Merge branch 'jc/dashless' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2008-07-01
Junio C Hamano
Merge branch 'nd/dashless'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-01
Miklos Vajna
Move commit_list_count() to commit.c
blob
|
commitdiff
|
raw
2008-06-27
Junio C Hamano
Merge branch 'maint-1.5.5' into maint
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-25
Junio C Hamano
Merge branch 'sb/rebase'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-25
Junio C Hamano
Merge branch 'lw/gitweb'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-25
Junio C Hamano
Merge branch 'lt/config-fsync'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-25
Junio C Hamano
Merge branch 'sr/tests'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-25
Junio C Hamano
Merge branch 'jh/clone-packed-refs'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-25
Junio C Hamano
Merge branch 'lw/perlish'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-25
Jeff King
clone: create intermediate directories of destination...
blob
|
commitdiff
|
raw
|
diff to current
2008-06-25
Junio C Hamano
Merge branch 'jc/maint-combine-diff-pre-context' into...
blob
|
commitdiff
|
raw
|
diff to current
2008-06-25
Jeff King
clone: create intermediate directories of destination...
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'rs/archive-ignore'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'lt/racy-empty'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'jc/maint-combine-diff-pre-context'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'mo/status-untracked'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'kh/update-ref'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'rg/gitweb'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-14
Junio C Hamano
Merge branch 'rs/attr'
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-06-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-09
Junio C Hamano
Merge branch 'js/merge-recursive'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-09
Johannes Schindelin
merge-recursive: respect core.autocrlf when writing...
blob
|
commitdiff
|
raw
|
diff to current
2008-06-07
Junio C Hamano
Merge 1.5.5.4 in
blob
|
commitdiff
|
raw
|
diff to current
2008-06-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-28
Junio C Hamano
Merge 1.5.5.3 in
blob
|
commitdiff
|
raw
|
diff to current
2008-05-27
Junio C Hamano
Merge branch 'jc/diff-no-no-index'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-27
Junio C Hamano
Merge branch 'maint'
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'
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-25
Junio C Hamano
Merge branch 'js/config-cb'
v1.5.6-rc0
blob
|
commitdiff
|
raw
|
diff to current
2008-05-25
Junio C Hamano
Merge branch 'db/clone-in-c'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-25
Junio C Hamano
Merge branch 'ar/batch-cat'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-25
Junio C Hamano
Merge branch 'ap/svn'
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 'pb/push'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-23
Junio C Hamano
Merge branch 'bc/repack'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-23
Junio C Hamano
Merge branch 'sp/ignorecase'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-23
Junio C Hamano
Merge branch 'maint'
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'
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-21
Junio C Hamano
Merge branch 'ar/add-unreadable'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-21
Junio C Hamano
Merge branch 'ds/branch-auto-rebase'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-21
Junio C Hamano
Merge branch 'sv/first-parent'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-21
Junio C Hamano
Merge branch 'np/pack'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-21
Junio C Hamano
Merge branch 'as/graph'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-21
Junio C Hamano
Merge branch 'jk/maint-send-email-compose'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-21
Junio C Hamano
Merge branch 'hb/maint-send-email-quote-recipients'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-17
Junio C Hamano
Merge branch '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'
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-14
Junio C Hamano
Merge branch 'sb/committer'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-14
Junio C Hamano
Merge branch 'bd/tests'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-14
Junio C Hamano
Merge branch 'mv/format-cc'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-14
Junio C Hamano
Merge branch 'cc/hooks-doc'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-14
Junio C Hamano
Merge branch 'jk/renamelimit' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2008-05-14
Johannes Schindelin
Provide git_config with a callback-data parameter
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-05-03
Jeff King
diff: make "too many files" rename warning optional
blob
|
commitdiff
|
raw
|
diff to current
2008-05-03
Jeff King
bump rename limit defaults
blob
|
commitdiff
|
raw
|
diff to current
2008-05-03
Jeff King
add merge.renamelimit config option
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
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
