Git help

Revision as of 17:42, 7 November 2013 by Robertr (talk | contribs) (→‎Tags (releases))
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to navigation Jump to search


# centos/rhel
wget -O ~/.git-completion
emacs ~/.bash_profile
source ~/.git-completion



  • Source Branch: dev ( what we want to cherry pick from )
  • Target Branch: test
# checkout your target branch ( the branch you want to merge into )
git checkout test
# create a new branch -- easier to redo mistakes ( delete branch and start over )
git branch test-cp
# find commits you want to cherry-pick ( in this case we are cherry picking from "dev")
git log --pretty=oneline dev
# pick commits from bottom to top ( repeat for all commits)
git cherry-pick "hash"
# check results
git diff test..test-cp
# if you are happy with results
git checkout test
git merge test-cp
git push



git checkout branch
git branch newbranchname
git checkout newbranchname


git checkout newbranchname
git push origin newbanchname


git branch -D newbranchname
git push origin :newbranchname


Merging Dev -> Master

  • Will checkout the 'master' branch and merge from the 'dev' branch. Any applicable changes within 'dev' will be in 'master' once this command has completed.
git checkout master
git merge dev

Merging Master -> Dev

  • Will checkout the 'master' branch and merge from the 'dev' branch. Any applicable changes within 'dev' will be in 'master' once this command has completed.
git checkout dev
git merge master

Selective Merge - Patches

  • merging 'mybranch' with updates from 'master'
git checkout mybranch
git branch merge_master_mybranch_patch
git checkout master
git diff --no-prefix mybranch > mybranch.patch
  • Edit the mybranch.patch to your needs.. excluding changes you do not want from master
  • When you are ready to patch - checkout your branch 'mybranch' to patch
git checkout merge_master_mybranch_patch
patch -p0 < mybranch.patch
git commit -am 'merge master with mybranch.patch'
git push
  • Now if you are happy with the changes.. lets actually merge the changes with your branch
git checkout mybranch
git merge merge_master_mybranch_patch
git push

Syncing a Forked Repo

The Setup

Before you can sync, you need to add a remote that points to the upstream repository. You may have done this when you originally forked.

Tip: Syncing your fork only updates your local copy of the repository; it does not update your repository on GitHub.

git remote -v
# List the current remotes
# origin (fetch)
# origin (push)
git remote add upstream
# Set a new remote
git remote -v
# Verify new remote
# origin (fetch)
# origin (push)
# upstream (fetch)
# upstream (push)


There are two steps required to sync your repository with the upstream: first you must fetch from the remote, then you must merge the desired branch into your local branch.

Just reset from Head

git fetch upstream
git checkout master
git reset --hard upstream/master  
git push origin master --force


Fetching from the remote repository will bring in its branches and their respective commits. These are stored in your local repository unders special branches.

git fetch upstream
# Grab the upstream remote's branches
# remote: Counting objects: 75, done.
# remote: Compressing objects: 100% (53/53), done.
# remote: Total 62 (delta 27), reused 44 (delta 9)
# Unpacking objects: 100% (62/62), done.
# From
#  * [new branch]      master     -> upstream/master

We now have the upstream's master branch stored in a local branch, upstream/master

git branch -va
# List all local and remote-tracking branches
# * master                  a422352 My local commit
#   remotes/origin/HEAD     -> origin/master
#   remotes/origin/master   a422352 My local commit
#   remotes/upstream/master 5fdff0f Some upstream commit


Now that we have fetched the upstream repository, we want to merge its changes into our local branch. This will bring that branch into sync with the upstream, without losing our local changes.

git checkout master
# Check out our local master branch
# Switched to branch 'master'
git merge upstream/master
# Merge upstream's master into our own
# Updating a422352..5fdff0f
# Fast-forward
#  README                    |    9 -------
#                 |    7 ++++++
#  2 files changed, 7 insertions(+), 9 deletions(-)
#  delete mode 100644 README
#  create mode 100644

If your local branch didn't have any unique commits, git will instead perform a "fast-forward":

git merge upstream/master
# Updating 34e91da..16c56ad
# Fast-forward
#                 |    5 +++--
#  1 file changed, 3 insertions(+), 2 deletions(-)

checkout upstream

git checkout -b upstream upstream/master


git checkout branch
git rebase master
#First, rewinding head to replay your work on top of it...
#Applying: added staged command
git pull
git push

Tags (releases)


git checkout <branch>
git tag -a v0.0.17 -m "plexWatch v0.0.17 Release"
git push --tags


git tag
git tag -d test-tag
 Deleted tag 'test-tag' (was 865ff0f)
git push origin :refs/tags/test-tag
 - [deleted]         test-tag