Where are we ?
We are back in the
puppylinux-woof-CE.d
that we created at Howto git PART 1
and again in the xterminal urxvt or xterm .
# pwd
command shows
/root/puppylinux-woof-CE.d
and
# ls -1a
.
..
.git
kernel-kit
LICENSE
merge2out
README
README-FIRST
vcs-workarounds
woof-arch
woof-code
woof-distro
Code: Select all
git branch
firmware
* master
testing
-- the asterix * indicating the current file status that would open in geany texteditor .
Code: Select all
git log
Code: Select all
commit 94a36111339d2ec03a65f44be9225b266202d56d
Author: mavrothal <mavrothal@yahoo.com>
Date: Wed Dec 18 03:43:58 2013 +0800
Revert "Move all-firmware to modem-firmware"
This reverts commit 139c3b69a9e2b5c4a901167a891f98eda0e39df8.
Setting the pager to e3 or mp is something for masochists .
Now it is time to create a branch, let's name it playground :
Code: Select all
git branch playground
Where are we ?
Again
git branch
firmware
* master
playground
testing
tells us we are still in master .
So on with switching to the new branch playground :
Code: Select all
git checkout playground
Switched to branch 'playground'
Code: Select all
git log
commit 94a36111339d2ec03a65f44be9225b266202d56d
Author: mavrothal <mavrothal@yahoo.com>
Date: Wed Dec 18 03:43:58 2013 +0800
Revert "Move all-firmware to modem-firmware"
This reverts commit 139c3b69a9e2b5c4a901167a891f98eda0e39df8.
-- the same commit level as the branch that was switched from .
git branch again gives us the asterix * now before playground :
firmware
master
* playground
testing
Now it's about time to switch to the testing branch and delete the playground branch :
Code: Select all
git checkout testing
git log is showing
commit 9c6a9b0bce772af7b5bb473672b77a51d7abaa1e
Merge: ea14655 9132f26
Author: mavrothal <mavrothal@users.noreply.github.com>
Date: Tue Dec 17 11:48:48 2013 -0800
Merge pull request #244 from KarlGodt/mavrothal-woof-CE-testing
/usr/sbin/shutdownconfig : Handle SAVEMARK file in subdirectory
because it has a different commit level than the other branch , in this case it is further ahead .
Now about to delete the playground branch :
Code: Select all
git branch -D playground
Deleted branch playground (was 94a3611).
LAST for this lesson :
We create the playground branch again,
now from the testing branch
and submit the new branch to our fork at github.com :
# git branch
firmware
master
* testing
Code: Select all
git checkout -b playground
git checkout -b is short for "git branch;git checkout"
# git branch
firmware
master
* playground
testing
# git log
commit 9c6a9b0bce772af7b5bb473672b77a51d7abaa1e
Merge: ea14655 9132f26
Author: mavrothal <mavrothal@users.noreply.github.com>
Date: Tue Dec 17 11:48:48 2013 -0800
Merge pull request #244 from KarlGodt/mavrothal-woof-CE-testing
/usr/sbin/shutdownconfig : Handle SAVEMARK file in subdirectory
Code: Select all
git remote -v
woofce https://github.com/puppylinux-woof-CE/woof-CE (fetch)
woofce https://github.com/puppylinux-woof-CE/woof-CE (push)
so it needs to setup another remote - our pup-noob remote fork by
Code: Select all
git remote add pup-noob https://github.com/pup-noob/woof-CE
pup-noob https://github.com/pup-noob/woof-CE (fetch)
pup-noob https://github.com/pup-noob/woof-CE (push)
woofce https://github.com/puppylinux-woof-CE/woof-CE (fetch)
woofce https://github.com/puppylinux-woof-CE/woof-CE (push)
AND NOW THE BIG MOMENT : Pushing the new branch playground to our remote fork on github.com :
Code: Select all
git push pup-noob playground
Password:
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/pup-noob/woof-CE
* [new branch] playground -> playground
GIT btw is Wary-5.5 devx.sfs loaded into current Slacko-5.6.5
# git --version
git version 1.7.5.4
And in the internet browser it shows