git cheatsheet

REMOTES

git remote add coolbho https://github.com/coolbho3k/Xoom-OC.git
git remote add cyber https://github.com/cybertronic/Xoom-OC.git
git remote add kcrudup https://github.com/kcrudup/Xoom-OC-CP.git
git remote add tegra git://android.git.kernel.org/kernel/tegra.git
git remote add common git://android.git.kernel.org/kernel/common.git
git remote add aufs http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git
git remote add nvidia http://nv-tegra.nvidia.com/gitweb/?p=linux-2.6.git
git remote add tdr git://github.com/TDR/Xoom.git

CLONE REPO
git clone https://bigrushdog@github.com/Tiamat-AOSP/Xoom-OC.git

CREATE NEW BRANCH
git checkout -b bigrushdog-exp

CHANGE BRANCH
git checkout bigrushdog-exp

VIEW ALL BRANCHES
git branch -a

ADD REMOTE SOURCE
git remote add cyber https://cyber@github.com/Tiamat-AOSP/Xoom-OC.git

REMOVE REMOTE BRANCH
git push origin :cybertronic-android-tegra-2.6.36-honeycomb

REMOVE LOCAL BRANCH
git brand -D local_branch

STAGE REMOTE FOR CHERRYPICKING
git fetch cyber

PULL REMOTE BRANCH
git checkout cyber (change to desired local branch)
git pull cyber cyber-branch (pull into desired branch)

CHERRYPICK A COMMIT
git cherry-pick <commit tag>

FIX PULL ERRORS
>>>>>>>>>>>>>>>>>>>>>>>>>>>
HEAD
then some code      THIS IS BEFORE PULL, DELETE
then
=================
some more code      THIS IS AFTER PULL, KEEP
<<<<<<<<<<<<<<<<<<<<<

COMMIT
git checkout desired-branch
git add 'drop file here'
git commit -m 'commit message here'
git push origin desired-remote-branch

MERGE PULL REQUEST
git checkout -b cybertronic-android-tegra-2.6.36-honeycomb android-tegra-2.6.36-honeycomb
git pull https://github.com/cybertronic/Xoom-OC.git android-tegra-2.6.36-honeycomb
git checkout android-tegra-2.6.36-honeycomb
git merge cybertronic-android-tegra-2.6.36-honeycomb
git push origin android-tegra-2.6.36-honeycomb

GIT STASH

Use git stash when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the HEAD commit.

The modifications stashed away by this command can be listed with git stash list, inspected with git stash show, and restored (potentially on top of a different commit) with git stash apply. Calling git stash without any arguments is equivalent to git stash save. A stash is by default listed as "WIP on branchname …", but you can give a more descriptive message on the command line when you create one.