summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2005-09-13read-tree: fix bogus debugging statement.Libravatar Junio C Hamano1-6/+9
2005-09-13git-merge-recursive: Trivial RE fixes.Libravatar Junio C Hamano1-2/+2
2005-09-13[PATCH] Use the 'die' function where it is appropriate.Libravatar Fredrik Kuivinen1-14/+13
2005-09-13[PATCH] Use a temporary index file when we merge the common ancestors.Libravatar Fredrik Kuivinen1-5/+18
2005-09-13[PATCH] Adjust git-merge-recursive.py for the new tool names.Libravatar Fredrik Kuivinen1-4/+4
2005-09-13[PATCH] Don't output 'Automatic merge failed, ...'Libravatar Fredrik Kuivinen1-1/+0
2005-09-13[PATCH] Be more like the 'resolve' strategy.Libravatar Fredrik Kuivinen1-35/+33
2005-09-13[PATCH] Define relative .git/objects/info/alternates semantics.Libravatar Junio C Hamano1-6/+22
2005-09-13Detect ls-remote failure properly.Libravatar Junio C Hamano1-3/+12
2005-09-13[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Libravatar Fredrik Kuivinen4-4/+4
2005-09-12Fix off-by-one error in git-mergeLibravatar Junio C Hamano1-1/+1
2005-09-12Propagate errors from fetch-pack correctly to git-fetch.Libravatar Junio C Hamano1-2/+9
2005-09-12Fix CDPATH problem.Libravatar Junio C Hamano2-0/+9
2005-09-12Document git-grep and link it from the main git(7) page.Libravatar Junio C Hamano3-3/+54
2005-09-12[PATCH] Make 'git checkout' a bit more forgiving when switching branches.Libravatar Junio C Hamano1-0/+1
2005-09-12[PATCH] Omit patches that have already been merged from format-patch output.Libravatar Junio C Hamano1-11/+27
2005-09-12[PATCH] There are several undocumented dependenciesLibravatar Horst von Brand2-3/+12
2005-09-12Improve "git grep" flags handlingLibravatar Linus Torvalds1-23/+41
2005-09-12[PATCH] Make the ProgramError class printable.Libravatar Fredrik Kuivinen1-0/+3
2005-09-12[PATCH] Make sure we die if we don't get enough arguments.Libravatar Fredrik Kuivinen1-0/+3
2005-09-12[PATCH] Introduce a 'die' function.Libravatar Fredrik Kuivinen2-14/+13
2005-09-12[PATCH] Exit with status code 2 if we get an exception.Libravatar Fredrik Kuivinen1-7/+12
2005-09-12[PATCH] Fix assertion failure when merging common ancestors.Libravatar Fredrik Kuivinen1-1/+1
2005-09-12Allow finding things that begin with a dash in 'git grep'Libravatar Junio C Hamano1-1/+6
2005-09-12[PATCH] Add "git grep" helperLibravatar Linus Torvalds2-1/+21
2005-09-12[PATCH] Add note about IANA confirmationLibravatar Linus Torvalds1-0/+11
2005-09-11Use int instead of socklen_tLibravatar Junio C Hamano1-4/+4
2005-09-11[PATCH] Apply N -> A status change in diff-helperLibravatar Herbert Xu1-1/+1
2005-09-11[PATCH] archimport - better handling of temp dirsLibravatar martin@catalyst.net.nz1-5/+5
2005-09-11[PATCH] archimport - use GIT_DIR instead of hardcoded ".git"Libravatar martin@catalyst.net.nz1-20/+22
2005-09-11[PATCH] archimport - update in-script doco, options tidyupLibravatar martin@catalyst.net.nz1-17/+16
2005-09-11[PATCH] archimport documentation tidyupLibravatar martin@catalyst.net.nz1-4/+5
2005-09-11[PATCH] archimport documentation updateLibravatar martin@catalyst.net.nz1-10/+49
2005-09-11[PATCH] Escape asciidoc's built-in em-dash replacementLibravatar Yasushi SHOJI4-12/+12
2005-09-11[PATCH] Fix buffer overflow in ce_flush().Libravatar Qingning Huo1-0/+7
2005-09-10Add a new merge strategy by Fredrik Kuivinen.Libravatar Junio C Hamano9-7/+741
2005-09-10'git-merge': Documentation.Libravatar Junio C Hamano2-0/+55
2005-09-10Use Daniel's read-tree in the merge strategy 'resolve'.Libravatar Junio C Hamano4-39/+88
2005-09-10Multi-backend merge driver.Libravatar Junio C Hamano5-2/+381
2005-09-10Plug leak in Daniel's read-tree.Libravatar Junio C Hamano1-0/+1
2005-09-10[PATCH] Add debugging help for case #16 to read-tree.cLibravatar Junio C Hamano2-8/+44
2005-09-10[PATCH] Disable debugging from read-tree.Libravatar Junio C Hamano1-3/+10
2005-09-10[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Libravatar Daniel Barkalow1-0/+92
2005-09-10[PATCH] Rewrite read-treeLibravatar Daniel Barkalow2-804/+421
2005-09-10[PATCH] Add function to append to an object_list.Libravatar Daniel Barkalow2-0/+14
2005-09-10[PATCH] Add a function for getting a struct tree for an ent.Libravatar Daniel Barkalow2-0/+24
2005-09-10Fix 'git-show-branch --list <head>'Libravatar Junio C Hamano1-1/+1
2005-09-10Add 'git bisect replay/log' documentation.Libravatar Junio C Hamano1-1/+11
2005-09-10Keep bisection log so that it can be replayed later.Libravatar Junio C Hamano1-3/+47
2005-09-10Fix copy marking from diffcore-rename.Libravatar Junio C Hamano2-5/+39