Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
unpack-trees.c
Age
Commit message (
Expand
)
Author
2007-04-04
Fix switching to a branch with D/F when current branch has file D.
Junio C Hamano
2007-04-04
Fix twoway_merge that passed d/f conflict marker to merged_entry().
Junio C Hamano
2007-04-04
unpack-trees: get rid of *indpos parameter.
Junio C Hamano
2007-04-04
unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
Junio C Hamano
2007-03-21
Initialize tree descriptors with a helper function rather than by hand.
Linus Torvalds
2006-12-20
simplify inclusion of system header files.
Junio C Hamano
2006-12-13
Merge branch 'jc/read-tree-ignore'
Junio C Hamano
2006-12-06
read-tree: further loosen "working file will be lost" check.
Junio C Hamano
2006-12-05
unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
Junio C Hamano
2006-10-28
merge: loosen overcautious "working file will be lost" check.
Junio C Hamano
2006-08-24
Convert memcpy(a,b,20) to hashcpy(a,b).
Shawn Pearce
2006-08-18
Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
David Rientjes
2006-08-16
remove unnecessary initializations
David Rientjes
2006-08-16
use appropriate typedefs
David Rientjes
2006-07-31
read-tree: move merge functions to the library
Johannes Schindelin
2006-07-31
read-trees: refactor the unpack_trees() part
Johannes Schindelin