index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
unpack-trees.c
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
delay progress display when checking out files
Nicolas Pitre
2007-04-23
1
-7
/
+2
*
make progress "title" part of the common progress interface
Nicolas Pitre
2007-04-23
1
-4
/
+3
*
common progress display support
Nicolas Pitre
2007-04-23
1
-45
/
+9
*
Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
Junio C Hamano
2007-04-10
1
-14
/
+20
*
t1000: fix case table.
Junio C Hamano
2007-04-10
1
-1
/
+1
*
Fix switching to a branch with D/F when current branch has file D.
Junio C Hamano
2007-04-04
1
-1
/
+112
*
Fix twoway_merge that passed d/f conflict marker to merged_entry().
Junio C Hamano
2007-04-04
1
-2
/
+8
*
unpack-trees: get rid of *indpos parameter.
Junio C Hamano
2007-04-04
1
-9
/
+7
*
unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
Junio C Hamano
2007-04-04
1
-7
/
+7
*
Initialize tree descriptors with a helper function rather than by hand.
Linus Torvalds
2007-03-21
1
-2
/
+1
*
simplify inclusion of system header files.
Junio C Hamano
2006-12-20
1
-2
/
+0
*
Merge branch 'jc/read-tree-ignore'
Junio C Hamano
2006-12-13
1
-5
/
+19
|
\
|
*
read-tree: further loosen "working file will be lost" check.
Junio C Hamano
2006-12-06
1
-5
/
+19
*
|
unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
Junio C Hamano
2006-12-04
1
-3
/
+5
|
/
*
merge: loosen overcautious "working file will be lost" check.
Junio C Hamano
2006-10-28
1
-3
/
+1
*
Convert memcpy(a,b,20) to hashcpy(a,b).
Shawn Pearce
2006-08-23
1
-1
/
+1
*
Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
David Rientjes
2006-08-17
1
-1
/
+1
*
remove unnecessary initializations
David Rientjes
2006-08-16
1
-1
/
+1
*
use appropriate typedefs
David Rientjes
2006-08-16
1
-1
/
+1
*
read-tree: move merge functions to the library
Johannes Schindelin
2006-07-31
1
-0
/
+404
*
read-trees: refactor the unpack_trees() part
Johannes Schindelin
2006-07-31
1
-0
/
+395