Skip to content

Instantly share code, notes, and snippets.

@murano500k
Last active April 28, 2017 08:58
Show Gist options
  • Save murano500k/a355456f4d1e3a4aed999f43b702303b to your computer and use it in GitHub Desktop.
Save murano500k/a355456f4d1e3a4aed999f43b702303b to your computer and use it in GitHub Desktop.
git clone ssh://[email protected]:29418/renesas/device/renesas/salvator/common
git checkout r-ncar
gitdir=$(git rev-parse --git-dir); scp -p -P 29418 [email protected]: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://[email protected]:29418/renesas/platform/manifest -b r-car-7.1
repo init -u ssh://[email protected]: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