summaryrefslogtreecommitdiffstats
path: root/read-tree.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lt/oneway' into nextJunio C Hamano2006-05-151-4/+12
|\
| * read-tree --reset -u fix.Linus Torvalds2006-05-151-4/+12
* | Merge branch 'lt/oneway' into nextJunio C Hamano2006-05-151-0/+3
|\|
| * read-tree -u one-way merge fix to check out locally modified paths.Junio C Hamano2006-05-151-0/+3
* | Merge branch 'lt/oneway' into nextJunio C Hamano2006-05-151-1/+1
|\|
| * Allow one-way tree merge to remove old filesLinus Torvalds2006-05-151-1/+1
* | Merge branch 'jc/clean' into nextJunio C Hamano2006-05-091-2/+2
|\|
| * Separate object name errors from usage errorsDmitry V. Levin2006-05-091-2/+2
* | Merge branch 'jc/gitlink' into nextJunio C Hamano2006-05-081-5/+63
|\ \
| * | read-tree: --prefix=<path>/ option.Junio C Hamano2006-05-021-7/+65
* | | Fix crash when reading the empty treeJohannes Schindelin2006-05-071-2/+2
* | | read-tree: invalidate cache-tree entry when a new index entry is added.Junio C Hamano2006-05-041-0/+2
|/ /
* | read-tree: teach 1-way merege and plain read to prime cache-tree.Junio C Hamano2006-04-271-0/+45
* | read-tree: teach 1 and 2 way merges about cache-tree.Junio C Hamano2006-04-271-4/+13
* | index: make the index file format extensible.Junio C Hamano2006-04-251-0/+2
|/
* Merge branch 'pe/cleanup' into nextJunio C Hamano2006-04-041-6/+3
|\
| * Replace xmalloc+memset(0) with xcalloc.Peter Eriksen2006-04-041-6/+3
* | Merge branch 'lt/fix-sol-pack' into nextJunio C Hamano2006-04-041-9/+19
|\ \ | |/ |/|
| * Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.v1.2.5Jason Riedy2006-04-041-9/+19
* | sha1_name: warning ambiguous refs.Junio C Hamano2006-03-241-0/+1
* | Add --temp and --stage=all options to checkout-index.Shawn Pearce2006-03-051-1/+1
* | Documentation: read-tree --aggressiveJunio C Hamano2006-03-021-1/+1
* | Merge branch 'maint'Junio C Hamano2006-03-021-2/+4
|\|
| * read-tree --aggressive: remove deleted entry from the working tree.Junio C Hamano2006-03-021-2/+4
* | Merge fixes early for next maint series.Junio C Hamano2006-02-241-2/+62
|\|
| *-. Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak' and 'ar/fix-win' into ...Junio C Hamano2006-02-241-0/+60
| |\ \
| | * | checkout - eye candy.Junio C Hamano2006-02-231-0/+60
| | |/
| * / Give no terminating LF to error() function.Junio C Hamano2006-02-231-2/+2
| |/
* / "Assume unchanged" gitJunio C Hamano2006-02-091-1/+1
|/
* read-tree --aggressiveJunio C Hamano2006-02-071-0/+32
* avoid asking ?alloc() for zero bytes.Junio C Hamano2005-12-271-7/+10
* Make the rest of commands work from a subdirectory.Junio C Hamano2005-11-291-0/+2
* ls-files and read-tree need core.filemodeAlex Riesen2005-11-081-0/+2
* Remove empty directories after read-tree -u.Junio C Hamano2005-10-111-1/+30
* read-tree: --trivialLinus Torvalds2005-10-021-0/+12
* read-tree: remove --head option.Junio C Hamano2005-10-021-8/+2
* Document -i flag to git-read-treeJunio C Hamano2005-09-211-1/+1
* read-tree: fix bogus debugging statement.Junio C Hamano2005-09-141-6/+9
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-111-2/+20
* Plug leak in Daniel's read-tree.Junio C Hamano2005-09-111-0/+1
* [PATCH] Add debugging help for case #16 to read-tree.cJunio C Hamano2005-09-111-8/+28
* [PATCH] Disable debugging from read-tree.Junio C Hamano2005-09-111-3/+10
* [PATCH] Rewrite read-treeDaniel Barkalow2005-09-111-382/+421
* [PATCH] Unify usage strings declarationPetr Baudis2005-07-301-1/+1
* Start adding interfaces to read in partial treesLinus Torvalds2005-07-141-1/+1
* git-read-tree: fix "--reset" handlingLinus Torvalds2005-06-151-0/+1
* [PATCH] read-tree: loosen too strict index requirementsJunio C Hamano2005-06-131-0/+6
* [PATCH] Finish making --emu23 equivalent to pure 2-way merge.Junio C Hamano2005-06-131-5/+132
* [PATCH] read-tree: fix too strong index requirement #5ALTJunio C Hamano2005-06-131-2/+18
* [PATCH] read-tree --emu23.Junio C Hamano2005-06-131-4/+77
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 12:35:58 +0100