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