repo.or.cz
/
socialgit.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Only end a branch if its rebase is complete.
[socialgit.git]
/
endbranch
blob
410cb21071f19e48befe0f1dbd0f94cada64f540
1
#!/bin/sh
2
# endbranch
3
4
CURBRANCH
=
`currentbranchname`
5
if
(
rebasebranch|
grep
"Rebasing complete."
);
then
6
git checkout master
7
git merge
$CURBRANCH
8
git branch
-d
$CURBRANCH
9
else
10
rebasebranch
$CURBRANCH
11
fi