tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Windows: TMP and TEMP environment variables specify a temporary directory.
[git.git]
/
builtin-merge-recursive.c
2008-06-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-06-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-06-14
Junio C Hamano
Merge branch 'rs/attr'
blob
|
commitdiff
|
raw
2008-06-11
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-06-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-06-09
Junio C Hamano
Merge branch 'js/merge-recursive'
blob
|
commitdiff
|
raw
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
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-23
Junio C Hamano
Merge branch 'git-p4' of git://repo.or.cz/git/git-p4
blob
|
commitdiff
|
raw
|
diff to current
2008-03-17
Junio C Hamano
Merge branch 'jc/makefile'
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 'jk/portable'
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 'cc/help'
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-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
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
