diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-28 11:46:20 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-28 11:46:20 +0400 |
| commit | 3e73cb2f48cc4044905455a9936692f967a0f9b3 (patch) | |
| tree | 9b4030b25e8b69e40f5de0ec00dd1ba2465a2f44 /Documentation/technical | |
| parent | cc137194519a8ddbc0514da088fb012bea40df51 (diff) | |
| parent | c922b01f54c4bebe84daeacf014cfbc8dc68479b (diff) | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt index 7ede1e64e5..5cb2b0590a 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`. |