Last active
November 3, 2017 09:19
-
-
Save murano500k/a8490d7fb3746290f4b20353e7d64f29 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git clone ssh://artem.radchenko@gerrit-ua.globallogic.com:29418/renesas/device/renesas/salvator/common | |
git checkout r-ncar | |
gitdir=$(git rev-parse --git-dir); scp -p -P 29418 artem.radchenko@gerrit-ua.globallogic.com:hooks/commit-msg ${gitdir}/hooks/ | |
git add [changes] | |
git commit -s #-s for signed by | |
git push gl-mirror HEAD:refs/for/r-car-7.1 | |
#repo init | |
repo init -u ssh://renesas/renesas/platform/manifest -b r-car-8 | |
repo init -u ssh://artem.radchenko@gerrit-ua.globallogic.com:29418/renesas/platform/manifest -b r-car-7.1.2 | |
#diff | |
git merge-base $BRANCH_NEW $BRANCH_OLD | |
git log --oneline --decorate $BRANCH_NEW ^$BRANCH_OLD | |
git log --oneline --decorate $BRANCH_NEW ^$BRANCH_OLD >>$OUT | |
###############################3 | |
git fetch | |
git branch -D r-car-7.1 | |
git checkout r-car-7.1 | |
git checkout r-car-7.1.2 | |
git log --oneline --decorate r-car-7.1 ^r-car-7.1.2 | |
git cherry-pick | |
git push gl-mirror HEAD:refs/for/r-car-7.1.2 | |
git cherry-pick .... | |
git mergetool | |
git cherry-pick --continue | |
###############################3 | |
http://stackoverflow.com/a/7546247 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment