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
Not sure if this helps
[socialgit.git]
/
bin
/
mergefrommaster
blob
fbbcc976d2fca762274401543cbefb7a6654a33e
1
#!/bin/sh
2
# mergefrommaster
3
4
CURBRANCH
=
`currentbranchname`
5
6
changebranch master
7
updatebranch
8
changebranch
$CURBRANCH
9
git merge master
10
if
(
git merge master|
grep
"You are in the middle of a conflicted merge."
);
then
11
echo
"Need to resolve conflicts from merging in master changes before continuing with commit."
12
exit -1
13
fi