aboutsummaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-28 00:46:39 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-28 00:46:39 -0700
commitb79376cdf3bd6ee922261776613d085a7b36ffd9 (patch)
tree544b5717e8c87ad8c8770273e9c79ff494441c0d /Documentation/technical
parent47afed5dc17faf10fde18789b17cf6ebff829cf4 (diff)
parent2254da06a5473ffde973337bad2c6a96eea61e20 (diff)
downloadgit-b79376cdf3bd6ee922261776613d085a7b36ffd9.tar.gz
git-b79376cdf3bd6ee922261776613d085a7b36ffd9.tar.xz
Merge branch 'maint'
* maint: 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
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/api-builtin.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt
index 7ede1e64e..5cb2b0590 100644
--- a/Documentation/technical/api-builtin.txt
+++ b/Documentation/technical/api-builtin.txt
@@ -37,7 +37,7 @@ where options is the bitwise-or of:
Make sure there is a work tree, i.e. the command cannot act
on bare repositories.
- This makes only sense when `RUN_SETUP` is also set.
+ This only makes sense when `RUN_SETUP` is also set.
. Add `builtin-foo.o` to `BUILTIN_OBJS` in `Makefile`.