История изменений
Исправление dhampire, (текущая версия) :
git checkout target_branch
git rebase origin/master
git reset --soft origin/master
git commit -m "big big commit diff between origin/master & target_branch"
Исходная версия dhampire, :
git checkout target_branch git rebase origin/master git reset --soft origin/master git commit -m «big big commit diff between origin/master & target_branch»