summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-28 16:26:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-28 16:26:18 (GMT)
commitcf98c423b571e4afbd78fda3e65d03ed9bdd34fc (patch)
tree7d37a6a281a04d6da2cd89f4fec0b2cd0f5e14b6 /Documentation
parent283cd320db9057163b2e7434ac481ff8e785671f (diff)
parent39d5bef5c1ceb82845af50a513660f24c77e3ce0 (diff)
downloadgit-cf98c423b571e4afbd78fda3e65d03ed9bdd34fc.zip
git-cf98c423b571e4afbd78fda3e65d03ed9bdd34fc.tar.gz
git-cf98c423b571e4afbd78fda3e65d03ed9bdd34fc.tar.bz2
Merge branch 'jn/doc-api-errors'
* jn/doc-api-errors: api-error-handling doc: typofix
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/technical/api-error-handling.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/api-error-handling.txt b/Documentation/technical/api-error-handling.txt
index fc68db1..ceeedd4 100644
--- a/Documentation/technical/api-error-handling.txt
+++ b/Documentation/technical/api-error-handling.txt
@@ -58,7 +58,7 @@ to `die` or `error` as-is. For example:
if (ref_transaction_commit(transaction, &err))
die("%s", err.buf);
-The 'err' parameter will be untouched if no error occured, so multiple
+The 'err' parameter will be untouched if no error occurred, so multiple
function calls can be chained:
t = ref_transaction_begin(&err);