aboutsummaryrefslogtreecommitdiff
path: root/read-tree.c
Commit message (Expand)AuthorAge
* Builtin git-read-tree.Peter Eriksen2006-05-23
* read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano2006-05-17
* read-tree --reset -u fix.Linus Torvalds2006-05-15
* read-tree -u one-way merge fix to check out locally modified paths.Junio C Hamano2006-05-15
* Allow one-way tree merge to remove old filesLinus Torvalds2006-05-14
* Separate object name errors from usage errorsDmitry V. Levin2006-05-08
* Merge branch 'pe/cleanup' into nextJunio C Hamano2006-04-04
|\
| * Replace xmalloc+memset(0) with xcalloc.Peter Eriksen2006-04-04
* | Merge branch 'lt/fix-sol-pack' into nextJunio C Hamano2006-04-03
|\ \ | |/ |/|
| * Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.v1.2.5Jason Riedy2006-04-03
* | sha1_name: warning ambiguous refs.Junio C Hamano2006-03-23
* | Add --temp and --stage=all options to checkout-index.Shawn Pearce2006-03-05
* | Documentation: read-tree --aggressiveJunio C Hamano2006-03-02
* | Merge branch 'maint'Junio C Hamano2006-03-01
|\ \ | |/
| * read-tree --aggressive: remove deleted entry from the working tree.Junio C Hamano2006-03-01
* | Merge fixes early for next maint series.Junio C Hamano2006-02-23
|\ \ | |/
| *-. Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak' and 'ar/fix-win' into ...Junio C Hamano2006-02-23
| |\ \
| | * | checkout - eye candy.Junio C Hamano2006-02-22
| | |/
| * | Give no terminating LF to error() function.Junio C Hamano2006-02-22
| |/
* | "Assume unchanged" gitJunio C Hamano2006-02-08
|/
* read-tree --aggressiveJunio C Hamano2006-02-06
* avoid asking ?alloc() for zero bytes.Junio C Hamano2005-12-26
* Make the rest of commands work from a subdirectory.Junio C Hamano2005-11-28
* ls-files and read-tree need core.filemodeAlex Riesen2005-11-08
* Remove empty directories after read-tree -u.Junio C Hamano2005-10-10
* read-tree: --trivialLinus Torvalds2005-10-02
* read-tree: remove --head option.Junio C Hamano2005-10-02
* Document -i flag to git-read-treeJunio C Hamano2005-09-20
* read-tree: fix bogus debugging statement.Junio C Hamano2005-09-13
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-10
* Plug leak in Daniel's read-tree.Junio C Hamano2005-09-10
* [PATCH] Add debugging help for case #16 to read-tree.cJunio C Hamano2005-09-10
* [PATCH] Disable debugging from read-tree.Junio C Hamano2005-09-10
* [PATCH] Rewrite read-treeDaniel Barkalow2005-09-10
* [PATCH] Unify usage strings declarationPetr Baudis2005-07-29
* Start adding interfaces to read in partial treesLinus Torvalds2005-07-14
* git-read-tree: fix "--reset" handlingLinus Torvalds2005-06-15
* [PATCH] read-tree: loosen too strict index requirementsJunio C Hamano2005-06-12
* [PATCH] Finish making --emu23 equivalent to pure 2-way merge.Junio C Hamano2005-06-12
* [PATCH] read-tree: fix too strong index requirement #5ALTJunio C Hamano2005-06-12
* [PATCH] read-tree --emu23.Junio C Hamano2005-06-12
* git-read-tree: remove deleted files in the working directoryLinus Torvalds2005-06-09
* git-read-tree: add "--reset" flagLinus Torvalds2005-06-09
* git-read-tree: -u without -m is meaningless. Don't allow it.Linus Torvalds2005-06-07
* git-read-tree: make one-way merge also honor the "update" flagLinus Torvalds2005-06-07
* [PATCH] read-tree: save more user hassles during fast-forward.Junio C Hamano2005-06-07
* git-read-tree: some "final" cleanupsLinus Torvalds2005-06-06
* git-read-tree: simplify merge loops enormouslyLinus Torvalds2005-06-06
* [PATCH] index locking like everybody elseJunio C Hamano2005-06-06
* Fix off-by-one in new three-way-merge updatesLinus Torvalds2005-06-05