diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-12 15:44:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-12 15:44:43 -0700 |
| commit | eafa29b7cb27fa0e14d9629e66d6866292620113 (patch) | |
| tree | 2dfc167d2e661178dab11c4321481e5a9d432e72 /Documentation/git-bisect.txt | |
| parent | 65ea3b8c6d9517c5d7f2a6c089cc6578c9486114 (diff) | |
| parent | 42ba5ee776c00369ca72b76537ae622611a7b545 (diff) | |
| download | git-eafa29b7cb27fa0e14d9629e66d6866292620113.tar.gz git-eafa29b7cb27fa0e14d9629e66d6866292620113.tar.xz | |
Merge branch 'gp/bisect-fix'
* 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/git-bisect.txt')
| -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 539f37df2..0b8b0ebba 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -85,7 +85,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). |