Make 'unpack_trees()' have a separate source and destination index

Linus Torvalds committed over 18 years ago

Make 'unpack_trees()' take the index to work on as an argument

Linus Torvalds committed over 18 years ago

Add 'const' where appropriate to index handling functions

Linus Torvalds committed over 18 years ago

Fix tree-walking compare_entry() in the presense of --prefix

Linus Torvalds committed over 18 years ago

Move 'unpack_trees()' over to 'traverse_trees()' interface

Linus Torvalds committed over 18 years ago

Make 'traverse_trees()' traverse conflicting DF entries in parallel

Linus Torvalds committed over 18 years ago

Add return value to 'traverse_tree()' callback

Linus Torvalds committed over 18 years ago

Make 'traverse_tree()' use linked structure rather than 'const char *base'

Linus Torvalds committed over 18 years ago

Add 'df_name_compare()' helper function

Linus Torvalds committed over 18 years ago

builtin remote rm: remove symbolic refs, too

Johannes Schindelin committed over 18 years ago

Add a test for read-tree -u --reset with a D/F conflict

Jeff King committed over 18 years ago

Merge branch 'ph/parseopt'

Junio C Hamano committed over 18 years ago

Merge branch 'dp/clean-fix'

Junio C Hamano committed over 18 years ago

Merge branch 'ml/submodule-add-existing'

Junio C Hamano committed over 18 years ago

Merge branch 'mr/compat-snprintf'

Junio C Hamano committed over 18 years ago

Merge branch 'sp/fetch-optim'

Junio C Hamano committed over 18 years ago

Merge branch 'jc/describe-always'

Junio C Hamano committed over 18 years ago

Merge branch 'jc/am'

Junio C Hamano committed over 18 years ago

Merge branch 'cr/reset-parseopt'

Junio C Hamano committed over 18 years ago

Merge branch 'jn/gitweb-pickaxe'

Junio C Hamano committed over 18 years ago