s/frenglish/english/
[~madcoder/fosdem.git] / 02-rebase-patches.txt
1 $ git checkout upstream+patches
2 $ git rebase upstream
3
4 /* deal with conflicts */
5