summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-20 06:21:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-20 06:21:10 (GMT)
commitedf9d719d1d05c1eb4f652782febfdfede212648 (patch)
tree86e37bca053a0c5c3c99eb1124d97a9ffdb43e05 /Documentation
parentc41dd2fd7d3a16e6f0b1629d688bee3240db496c (diff)
parent6368d9f1af7a5d4c8af2f11ffdb6af577f1e98f5 (diff)
downloadgit-edf9d719d1d05c1eb4f652782febfdfede212648.zip
git-edf9d719d1d05c1eb4f652782febfdfede212648.tar.gz
git-edf9d719d1d05c1eb4f652782febfdfede212648.tar.bz2
Merge branch 'maint'
* maint: gitweb: Always call parse_date with timezone parameter bisect: explain the rationale behind 125
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-bisect.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index a1e47d6..4b4b096 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -241,7 +241,12 @@ exit(3) manual page), as the value is chopped with "& 0377".
The special exit code 125 should be used when the current source code
cannot be tested. If the script exits with this code, the current
-revision will be skipped (see `git bisect skip` above).
+revision will be skipped (see `git bisect skip` above). 125 was chosen
+as the highest sensible value to use for this purpose, because 126 and 127
+are used by POSIX shells to signal specific error status (127 is for
+command not found, 126 is for command found but not executable---these
+details do not matter, as they are normal errors in the script, as far as
+"bisect run" is concerned).
You may often find that during a bisect session you want to have
temporary modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a