index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
unpack-trees.c
Age
Commit message (
Expand
)
Author
Files
Lines
2008-01-21
Make on-disk index representation separate from in-core one
Linus Torvalds
1
-15
/
+14
2007-12-18
unpack-trees: FLEX_ARRAY fix
Linus Torvalds
1
-1
/
+1
2007-11-29
per-directory-exclude: lazily read .gitignore files
Junio C Hamano
1
-6
/
+0
2007-11-14
Merge branch 'jc/maint-add-sync-stat'
Junio C Hamano
1
-2
/
+2
2007-11-10
ce_match_stat, run_diff_files: use symbolic constants for readability
Junio C Hamano
1
-2
/
+2
2007-10-30
relax usage of the progress API
Nicolas Pitre
1
-5
/
+3
2007-10-30
make struct progress an opaque type
Nicolas Pitre
1
-5
/
+5
2007-10-17
more compact progress display
Nicolas Pitre
1
-2
/
+2
2007-08-10
Optimize the three-way merge of git-read-tree
Linus Torvalds
1
-2
/
+5
2007-08-10
Optimize the two-way merge of git-read-tree too
Linus Torvalds
1
-3
/
+4
2007-08-10
Optimize the common cases of git-read-tree
Linus Torvalds
1
-3
/
+3
2007-08-10
Move old index entry removal from "unpack_trees()" into the individual functions
Linus Torvalds
1
-6
/
+23
2007-08-10
Start moving unpack-trees to "struct tree_desc"
Linus Torvalds
1
-16
/
+9
2007-08-05
unpack-trees.c: assume submodules are clean during check-out
Junio C Hamano
1
-0
/
+9
2007-07-24
cleanup unpack-trees.c: shrink struct tree_entry_list
René Scharfe
1
-9
/
+3
2007-07-18
unpack-trees.c: assume submodules are clean during check-out
Sven Verdoolaege
1
-25
/
+50
2007-07-12
Teach read-tree 2-way merge to ignore intermediate symlinks
Junio C Hamano
1
-0
/
+3
2007-05-20
Merge branch 'maint-1.5.1' into maint
Junio C Hamano
1
-4
/
+0
2007-05-20
unpack-trees.c: verify_uptodate: remove dead code
Sven Verdoolaege
1
-4
/
+0
2007-05-11
read-tree -m -u: avoid getting confused by intermediate symlinks.
Junio C Hamano
1
-4
/
+10
2007-04-22
delay progress display when checking out files
Nicolas Pitre
1
-7
/
+2
2007-04-22
make progress "title" part of the common progress interface
Nicolas Pitre
1
-4
/
+3
2007-04-22
common progress display support
Nicolas Pitre
1
-45
/
+9
2007-04-10
Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
Junio C Hamano
1
-14
/
+20
2007-04-10
t1000: fix case table.
Junio C Hamano
1
-1
/
+1
2007-04-04
Fix switching to a branch with D/F when current branch has file D.
Junio C Hamano
1
-1
/
+112
2007-04-04
Fix twoway_merge that passed d/f conflict marker to merged_entry().
Junio C Hamano
1
-2
/
+8
2007-04-04
unpack-trees: get rid of *indpos parameter.
Junio C Hamano
1
-9
/
+7
2007-04-04
unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
Junio C Hamano
1
-7
/
+7
2007-03-21
Initialize tree descriptors with a helper function rather than by hand.
Linus Torvalds
1
-2
/
+1
2006-12-20
simplify inclusion of system header files.
Junio C Hamano
1
-2
/
+0
2006-12-13
Merge branch 'jc/read-tree-ignore'
Junio C Hamano
1
-5
/
+19
2006-12-05
read-tree: further loosen "working file will be lost" check.
Junio C Hamano
1
-5
/
+19
2006-12-04
unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
Junio C Hamano
1
-3
/
+5
2006-10-27
merge: loosen overcautious "working file will be lost" check.
Junio C Hamano
1
-3
/
+1
2006-08-23
Convert memcpy(a,b,20) to hashcpy(a,b).
Shawn Pearce
1
-1
/
+1
2006-08-17
Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
David Rientjes
1
-1
/
+1
2006-08-15
remove unnecessary initializations
David Rientjes
1
-1
/
+1
2006-08-15
use appropriate typedefs
David Rientjes
1
-1
/
+1
2006-07-30
read-tree: move merge functions to the library
Johannes Schindelin
1
-0
/
+404
2006-07-30
read-trees: refactor the unpack_trees() part
Johannes Schindelin
1
-0
/
+395