Skip to content
kubicek edited this page Sep 13, 2010 · 2 revisions

Jak jsem to mergnul?


git clone [email protected]:kubicek/marley.git
cd marley
git checkout -b plain origin/plain
git checkout -b merger
git rebase master
git rebase -i HEAD~80
# prvni radek nechat pick, dalsi stash
git checkout plain
git rebase merger
# pripsat commit message na prvni radek
git branch -d merger
git push origin plain

Clone this wiki locally