Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge some proposed fixes
author
Junio C Hamano
<junkio@cox.net>
Tue, 14 Feb 2006 07:34:58 +0000
(23:34 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 14 Feb 2006 07:34:58 +0000
(23:34 -0800)
Conflicts:
Documentation/git-commit.txt - taking the post 1.2.0 semantics.
Signed-off-by: Junio C Hamano <junkio@cox.net>
1
2
git-bisect.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
057f98e
3654638
)
diff --cc
git-bisect.sh
index 3c024aae73430f1927e65c925135d3030cb43f10,07502536ce24edbcec8d516054f1756fd3abe9a1..03df1433ef12014584f23f16e65124c219c2f466
---
1
/
git-bisect.sh
---
2
/
git-bisect.sh
+++ b/
git-bisect.sh
@@@
-181,8
-170,9
+181,9
@@@
bisect_reset()
esac
git checkout "$branch" &&
rm -fr "$GIT_DIR/refs/bisect"
- rm -f "$GIT_DIR/refs/heads/bisect"
+ rm -f "$GIT_DIR/refs/heads/bisect"
"$GIT_DIR/head-name"
rm -f "$GIT_DIR/BISECT_LOG"
+ rm -f "$GIT_DIR/BISECT_NAMES"
}
bisect_replay () {