summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2005-09-14Revert "[PATCH] plug memory leak in diff.c::diff_free_filepair()"Junio C Hamano
2005-09-14[PATCH] Fix alloc_filespec() initializationLinus Torvalds
2005-09-14Make merge comment git-pull makes for an octopus a bit prettier.Junio C Hamano
2005-09-14read-tree: fix bogus debugging statement.Junio C Hamano
2005-09-14git-merge-recursive: Trivial RE fixes.Junio C Hamano
2005-09-13[PATCH] Use the 'die' function where it is appropriate.Fredrik Kuivinen
2005-09-13[PATCH] Use a temporary index file when we merge the common ancestors.Fredrik Kuivinen
2005-09-13[PATCH] Adjust git-merge-recursive.py for the new tool names.Fredrik Kuivinen
2005-09-13[PATCH] Don't output 'Automatic merge failed, ...'Fredrik Kuivinen
2005-09-13[PATCH] Be more like the 'resolve' strategy.Fredrik Kuivinen
2005-09-13[PATCH] Define relative .git/objects/info/alternates semantics.Junio C Hamano
2005-09-13Detect ls-remote failure properly.Junio C Hamano
2005-09-13[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen
2005-09-13Fix off-by-one error in git-mergeJunio C Hamano
2005-09-13Propagate errors from fetch-pack correctly to git-fetch.Junio C Hamano
2005-09-13Fix CDPATH problem.Junio C Hamano
2005-09-13Document git-grep and link it from the main git(7) page.Junio C Hamano
2005-09-13[PATCH] Make 'git checkout' a bit more forgiving when switching branches.Junio C Hamano
2005-09-13[PATCH] Omit patches that have already been merged from format-patch output.Junio C Hamano
2005-09-13[PATCH] There are several undocumented dependenciesHorst von Brand
2005-09-13Improve "git grep" flags handlingLinus Torvalds
2005-09-12[PATCH] Make the ProgramError class printable.Fredrik Kuivinen
2005-09-12[PATCH] Make sure we die if we don't get enough arguments.Fredrik Kuivinen
2005-09-12[PATCH] Introduce a 'die' function.Fredrik Kuivinen
2005-09-12[PATCH] Exit with status code 2 if we get an exception.Fredrik Kuivinen
2005-09-12[PATCH] Fix assertion failure when merging common ancestors.Fredrik Kuivinen
2005-09-12Allow finding things that begin with a dash in 'git grep'Junio C Hamano
2005-09-12[PATCH] Add "git grep" helperLinus Torvalds
2005-09-12[PATCH] Add note about IANA confirmationLinus Torvalds
2005-09-12Use int instead of socklen_tJunio C Hamano
2005-09-12[PATCH] Apply N -> A status change in diff-helperHerbert Xu
2005-09-11[PATCH] archimport - better handling of temp dirsmartin@catalyst.net.nz
2005-09-11[PATCH] archimport - use GIT_DIR instead of hardcoded ".git"martin@catalyst.net.nz
2005-09-11[PATCH] archimport - update in-script doco, options tidyupmartin@catalyst.net.nz
2005-09-11[PATCH] archimport documentation tidyupmartin@catalyst.net.nz
2005-09-11[PATCH] archimport documentation updatemartin@catalyst.net.nz
2005-09-11[PATCH] Escape asciidoc's built-in em-dash replacementYasushi SHOJI
2005-09-11[PATCH] Fix buffer overflow in ce_flush().Qingning Huo
2005-09-11Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano
2005-09-11'git-merge': Documentation.Junio C Hamano
2005-09-11Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano
2005-09-11Multi-backend merge driver.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] Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow
2005-09-11[PATCH] Rewrite read-treeDaniel Barkalow
2005-09-11[PATCH] Add function to append to an object_list.Daniel Barkalow
2005-09-11[PATCH] Add a function for getting a struct tree for an ent.Daniel Barkalow
2005-09-11Fix 'git-show-branch --list <head>'Junio C Hamano