temp should not track firemind/master
parent
2361d6f4fc
commit
f726a94958
2
Makefile
2
Makefile
|
@ -694,7 +694,7 @@ fetch:
|
||||||
git fetch -v firemind master
|
git fetch -v firemind master
|
||||||
|
|
||||||
rebase-firemind:
|
rebase-firemind:
|
||||||
git checkout -b temp firemind/master
|
git checkout -b temp --no-track firemind/master
|
||||||
git rebase base --onto master
|
git rebase base --onto master
|
||||||
git checkout master
|
git checkout master
|
||||||
git merge --ff-only temp
|
git merge --ff-only temp
|
||||||
|
|
Loading…
Reference in New Issue