Junio C Hamano 2254da06a5 Merge branch 'maint-1.6.1' into maint ...

* maint-1.6.1:
  grep: fix segfault when "git grep '('" is given
  Documentation: fix a grammatical error in api-builtin.txt
  builtin-merge: fix a typo in an error message

2009-04-28 00:46:25 -07:00

..

.gitignore

…

api-allocation-growing.txt

…

api-builtin.txt

…

api-decorate.txt

…

api-diff.txt

…

api-directory-listing.txt

…

api-gitattributes.txt

…

api-grep.txt

…

api-hash.txt

…

api-history-graph.txt

…

api-in-core-index.txt

…

api-index-skel.txt

…

api-index.sh

…

api-lockfile.txt

…

api-object-access.txt

…

api-parse-options.txt

…

api-quote.txt

…

api-remote.txt

…

api-revision-walking.txt

…

api-run-command.txt

…

api-setup.txt

…

api-strbuf.txt

…

api-string-list.txt

…

api-tree-walking.txt

…

api-xdiff-interface.txt

…

pack-format.txt

…

pack-heuristics.txt

…

pack-protocol.txt

…

racy-git.txt

…

send-pack-pipeline.txt

…

shallow.txt

…

trivial-merge.txt

…