summaryrefslogtreecommitdiff
path: root/read-tree.c
Commit message (Expand)AuthorAgeFilesLines
* 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-031-9/+19
|\ \ | |/ |/|
| * Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.v1.2.5Jason Riedy2006-04-031-9/+19
* | sha1_name: warning ambiguous refs.Junio C Hamano2006-03-231-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-011-2/+4
|\ \ | |/
| * read-tree --aggressive: remove deleted entry from the working tree.Junio C Hamano2006-03-011-2/+4
* | Merge fixes early for next maint series.Junio C Hamano2006-02-231-2/+62
|\ \ | |/
| *-. Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak' and 'ar/fix-win' into ...Junio C Hamano2006-02-231-0/+60
| |\ \
| | * | checkout - eye candy.Junio C Hamano2006-02-221-0/+60
| | |/
| * | Give no terminating LF to error() function.Junio C Hamano2006-02-221-2/+2
| |/
* | "Assume unchanged" gitJunio C Hamano2006-02-081-1/+1
|/
* read-tree --aggressiveJunio C Hamano2006-02-061-0/+32
* avoid asking ?alloc() for zero bytes.Junio C Hamano2005-12-261-7/+10
* Make the rest of commands work from a subdirectory.Junio C Hamano2005-11-281-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-101-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-201-1/+1
* read-tree: fix bogus debugging statement.Junio C Hamano2005-09-131-6/+9
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-101-2/+20
* Plug leak in Daniel's read-tree.Junio C Hamano2005-09-101-0/+1
* [PATCH] Add debugging help for case #16 to read-tree.cJunio C Hamano2005-09-101-8/+28
* [PATCH] Disable debugging from read-tree.Junio C Hamano2005-09-101-3/+10
* [PATCH] Rewrite read-treeDaniel Barkalow2005-09-101-382/+421
* [PATCH] Unify usage strings declarationPetr Baudis2005-07-291-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-121-0/+6
* [PATCH] Finish making --emu23 equivalent to pure 2-way merge.Junio C Hamano2005-06-121-5/+132
* [PATCH] read-tree: fix too strong index requirement #5ALTJunio C Hamano2005-06-121-2/+18
* [PATCH] read-tree --emu23.Junio C Hamano2005-06-121-4/+77
* git-read-tree: remove deleted files in the working directoryLinus Torvalds2005-06-091-6/+18
* git-read-tree: add "--reset" flagLinus Torvalds2005-06-091-9/+38
* git-read-tree: -u without -m is meaningless. Don't allow it.Linus Torvalds2005-06-071-1/+3
* git-read-tree: make one-way merge also honor the "update" flagLinus Torvalds2005-06-071-5/+5
* [PATCH] read-tree: save more user hassles during fast-forward.Junio C Hamano2005-06-071-13/+36
* git-read-tree: some "final" cleanupsLinus Torvalds2005-06-061-14/+10
* git-read-tree: simplify merge loops enormouslyLinus Torvalds2005-06-061-163/+110
* [PATCH] index locking like everybody elseJunio C Hamano2005-06-061-17/+5
* Fix off-by-one in new three-way-merge updatesLinus Torvalds2005-06-051-1/+1
* Three-way merge: fix silly bug that made trivial merges not workLinus Torvalds2005-06-051-2/+2
* git-read-tree: fix up two-way mergeLinus Torvalds2005-06-051-15/+44
* More work on merging with git-read-tree..Linus Torvalds2005-06-051-19/+104
* git-read-tree: fix up three-way merge testsLinus Torvalds2005-06-051-14/+14
* git-read-tree: be a lot more careful about merging dirty treesLinus Torvalds2005-06-051-3/+51
* sparse cleanupLinus Torvalds2005-05-201-1/+1
View Lorry Controller Status