psi-jack
/
yadm
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix merge notice

This commit is contained in:
Tim Byrne 2015-07-14 08:16:45 -05:00
parent c941690295
commit 886c5ada53
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yadm
View File

@ -148,9 +148,11 @@ function clone() {
#; fetch / merge (and possibly fallback to reset)
debug "Doing an initial fetch of the origin"
git fetch origin
debug "Doing an initial merge of origin/master"
git merge origin/master || {
debug "Merge failed, doing a reset."
git reset origin/master
echo <<EOF
cat <<EOF
**NOTE**
Merging origin/master failed.
YADM did 'reset origin/master' instead.