summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make merge comment git-pull makes for an octopus a bit prettier.Junio C Hamano2005-09-131-3/+5
* read-tree: fix bogus debugging statement.Junio C Hamano2005-09-131-6/+9
* git-merge-recursive: Trivial RE fixes.Junio C Hamano2005-09-131-2/+2
* [PATCH] Use the 'die' function where it is appropriate.Fredrik Kuivinen2005-09-131-14/+13
* [PATCH] Use a temporary index file when we merge the common ancestors.Fredrik Kuivinen2005-09-131-5/+18
* [PATCH] Adjust git-merge-recursive.py for the new tool names.Fredrik Kuivinen2005-09-131-4/+4
* [PATCH] Don't output 'Automatic merge failed, ...'Fredrik Kuivinen2005-09-131-1/+0
* [PATCH] Be more like the 'resolve' strategy.Fredrik Kuivinen2005-09-131-35/+33
* [PATCH] Define relative .git/objects/info/alternates semantics.Junio C Hamano2005-09-131-6/+22
* Detect ls-remote failure properly.Junio C Hamano2005-09-131-3/+12
* [PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen2005-09-134-4/+4
* Fix off-by-one error in git-mergeJunio C Hamano2005-09-121-1/+1
* Propagate errors from fetch-pack correctly to git-fetch.Junio C Hamano2005-09-121-2/+9
* Fix CDPATH problem.Junio C Hamano2005-09-122-0/+9
* Document git-grep and link it from the main git(7) page.Junio C Hamano2005-09-123-3/+54
* [PATCH] Make 'git checkout' a bit more forgiving when switching branches.Junio C Hamano2005-09-121-0/+1
* [PATCH] Omit patches that have already been merged from format-patch output.Junio C Hamano2005-09-121-11/+27
* [PATCH] There are several undocumented dependenciesHorst von Brand2005-09-122-3/+12
* Improve "git grep" flags handlingLinus Torvalds2005-09-121-23/+41
* [PATCH] Make the ProgramError class printable.Fredrik Kuivinen2005-09-121-0/+3
* [PATCH] Make sure we die if we don't get enough arguments.Fredrik Kuivinen2005-09-121-0/+3
* [PATCH] Introduce a 'die' function.Fredrik Kuivinen2005-09-122-14/+13
* [PATCH] Exit with status code 2 if we get an exception.Fredrik Kuivinen2005-09-121-7/+12
* [PATCH] Fix assertion failure when merging common ancestors.Fredrik Kuivinen2005-09-121-1/+1
* Allow finding things that begin with a dash in 'git grep'Junio C Hamano2005-09-121-1/+6
* [PATCH] Add "git grep" helperLinus Torvalds2005-09-122-1/+21
* [PATCH] Add note about IANA confirmationLinus Torvalds2005-09-121-0/+11
* Use int instead of socklen_tJunio C Hamano2005-09-111-4/+4
* [PATCH] Apply N -> A status change in diff-helperHerbert Xu2005-09-111-1/+1
* [PATCH] archimport - better handling of temp dirsmartin@catalyst.net.nz2005-09-111-5/+5
* [PATCH] archimport - use GIT_DIR instead of hardcoded ".git"martin@catalyst.net.nz2005-09-111-20/+22
* [PATCH] archimport - update in-script doco, options tidyupmartin@catalyst.net.nz2005-09-111-17/+16
* [PATCH] archimport documentation tidyupmartin@catalyst.net.nz2005-09-111-4/+5
* [PATCH] archimport documentation updatemartin@catalyst.net.nz2005-09-111-10/+49
* [PATCH] Escape asciidoc's built-in em-dash replacementYasushi SHOJI2005-09-114-12/+12
* [PATCH] Fix buffer overflow in ce_flush().Qingning Huo2005-09-111-0/+7
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-109-7/+741
* 'git-merge': Documentation.Junio C Hamano2005-09-102-0/+55
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-104-39/+88
* Multi-backend merge driver.Junio C Hamano2005-09-105-2/+381
* 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-102-8/+44
* [PATCH] Disable debugging from read-tree.Junio C Hamano2005-09-101-3/+10
* [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow2005-09-101-0/+92
* [PATCH] Rewrite read-treeDaniel Barkalow2005-09-102-804/+421
* [PATCH] Add function to append to an object_list.Daniel Barkalow2005-09-102-0/+14
* [PATCH] Add a function for getting a struct tree for an ent.Daniel Barkalow2005-09-102-0/+24
* Fix 'git-show-branch --list <head>'Junio C Hamano2005-09-101-1/+1
* Add 'git bisect replay/log' documentation.Junio C Hamano2005-09-101-1/+11
* Keep bisection log so that it can be replayed later.Junio C Hamano2005-09-101-3/+47
View Lorry Controller Status