cedian@cedian-ubuntu-only:~$ cd ubuntu-vividcedian@cedian-ubuntu-only:~/ubuntu-vivid$ git checkout mako
Switched to branch 'mako'
Your branch is up-to-date with 'origin/mako'.
cedian@cedian-ubuntu-only:~/ubuntu-vivid$ git log --oneline
565c996 UBUNTU: Ubuntu-mako-3.4.0-5.34
6373cd5 UBUNTU: SAUCE: (no-up) apparmor: update configs for apparmor 3 - RC1
bd4c5a4 UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor3 - RC1 snapshot
1a1fc984 Revert "UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 6 snapshot"
dba7154 Revert "UBUNTU: SAUCE: (no-ip) apparmor: update configs for apparmor 3 alpha 6"
1805c41 Revert "UBUNTU: SAUCE: (no-up) apparmor: fix apparmor spams log with warning message"
883beff Revert "UBUNTU: SAUCE: (no-up) apparmor: fix refcount bug in apparmor pivotroot"
9ac12c7 Revert "UBUNTU: SAUCE: (no-up) apparmor: fix apparmor refcount bug in apparmor_kill"
6388cc0 Revert "UBUNTU: SAUCE: (no-up) apparmor: fix bug that constantly spam the console"
8f89392 Revert "UBUNTU: SAUCE: (no-up) apparmor: use custom write_is_locked macro"
2104b4a Revert "UBUNTU: SAUCE: (no-up) apparmor fix: remove unused cxt var for unix_sendmsg"
7410473 Revert "UBUNTU: SAUCE: (no-up) apparmor: fix disconnected bind mnts reconnection"
99f7c3d UBUNTU: Start new release
5a5e584 UBUNTU: Ubuntu-mako-3.4.0-5.33
cedian@cedian-ubuntu-only:~/ubuntu-vivid$ git checkout bd4c5a4
Note: checking out 'bd4c5a4'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name
HEAD is now at bd4c5a4... UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor3 - RC1 snapshot
cedian@cedian-ubuntu-only:~/ubuntu-vivid$ cp -r security/apparmor /tmp/
cedian@cedian-ubuntu-only:~/ubuntu-vivid$ git checkout -b android_kernel_opo
Switched to a new branch 'android_kernel_opo'
cedian@cedian-ubuntu-only:~/ubuntu-vivid$ git rebase --onto android_kernel_opo bd4c5a4
Current branch android_kernel_opo is up to date.
cedian@cedian-ubuntu-only:~/ubuntu-vivid$ git rebase -f --onto android_kernel_opo bd4c5a4
Current branch android_kernel_opo is up to date, rebase forced.
First, rewinding head to replay your work on top of it...
Fast-forwarded android_kernel_opo to android_kernel_opo.
cedian@cedian-ubuntu-only:~/ubuntu-vivid$ cp -r /tmp/apparmor/* security/apparmor/
cedian@cedian-ubuntu-only:~/ubuntu-vivid$ git status
On branch android_kernel_opo
nothing to commit, working directory clean