summaryrefslogtreecommitdiff
path: root/Documentation/git-bisect.txt
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2008-05-05 07:43:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-06 00:18:20 (GMT)
commitee831f7ddfc40e9144208c93e24d20ff0ad69194 (patch)
treebe7a81b489709ead6ebbbb6a0c662dca1f1add84 /Documentation/git-bisect.txt
parent6233a5210ef64ba31bbf0e867e03e9176e0aace9 (diff)
downloadgit-ee831f7ddfc40e9144208c93e24d20ff0ad69194.zip
git-ee831f7ddfc40e9144208c93e24d20ff0ad69194.tar.gz
git-ee831f7ddfc40e9144208c93e24d20ff0ad69194.tar.bz2
git-bisect.sh: don't accidentally override existing branch "bisect"
If a branch named "bisect" or "new-bisect" already was created in the repo by other means than git bisect, doing a git bisect used to override the branch without a warning. Now if the branch "bisect" or "new-bisect" already exists, and it was not created by git bisect itself, git bisect start fails with an appropriate error message. Additionally, if checking out a new bisect state fails due to a merge problem, git bisect cleans up the temporary branch "new-bisect". The accidental override has been noticed by Andres Salomon, reported through http://bugs.debian.org/478647 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-bisect.txt')
-rw-r--r--Documentation/git-bisect.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 96585ae..0855b98 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).