diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-27 06:15:03 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-27 06:15:03 +0400 |
| commit | 109440c1bf2a3015cd9253515f07231c4cf9d65a (patch) | |
| tree | 356abfc21c6afc50e660abbea2b8bb373c14d03d /Documentation | |
| parent | df2740b066b2d6649449f2d8efdd0727647ab57c (diff) | |
| parent | 42ba5ee776c00369ca72b76537ae622611a7b545 (diff) | |
Merge branch 'gp/bisect-fix' into maint
* gp/bisect-fix:
bisect: print an error message when "git rev-list --bisect-vars" fails
git-bisect.sh: don't accidentally override existing branch "bisect"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-bisect.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 96585ae8d9..0855b98b28 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -78,7 +78,7 @@ Oh, and then after you want to reset to the original head, do a $ git bisect reset ------------------------------------------------ -to get back to the master branch, instead of being in one of the +to get back to the original branch, instead of being in one of the bisection branches ("git bisect start" will do that for you too, actually: it will reset the bisection state, and before it does that it checks that you're not using some old bisection branch). |