Git help

From RARForge
Revision as of 21:01, 10 August 2013 by Robertr (talk | contribs) (→‎Rebase)
Jump to navigation Jump to search

Merging Branches

http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging

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.

<source> git checkout master git merge dev </source>


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.

<source> git checkout dev git merge master </source>


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. <source> git remote -v

  1. List the current remotes
  2. origin https://github.com/user/repo.git (fetch)
  3. origin https://github.com/user/repo.git (push)

git remote add upstream https://github.com/otheruser/repo.git

  1. Set a new remote

git remote -v

  1. Verify new remote
  2. origin https://github.com/user/repo.git (fetch)
  3. origin https://github.com/user/repo.git (push)
  4. upstream https://github.com/otheruser/repo.git (fetch)
  5. upstream https://github.com/otheruser/repo.git (push)

</source>


Syncing

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.

Fetching

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

<source> git fetch upstream

  1. Grab the upstream remote's branches
  2. remote: Counting objects: 75, done.
  3. remote: Compressing objects: 100% (53/53), done.
  4. remote: Total 62 (delta 27), reused 44 (delta 9)
  5. Unpacking objects: 100% (62/62), done.
  6. From https://github.com/otheruser/repo
  7. * [new branch] master -> upstream/master

</source>

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

<source> git branch -va

  1. List all local and remote-tracking branches
  2. * master a422352 My local commit
  3. remotes/origin/HEAD -> origin/master
  4. remotes/origin/master a422352 My local commit
  5. remotes/upstream/master 5fdff0f Some upstream commit

</source>


Merging

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.


<source> git checkout master

  1. Check out our local master branch
  2. Switched to branch 'master'

git merge upstream/master

  1. Merge upstream's master into our own
  2. Updating a422352..5fdff0f
  3. Fast-forward
  4. README | 9 -------
  5. README.md | 7 ++++++
  6. 2 files changed, 7 insertions(+), 9 deletions(-)
  7. delete mode 100644 README
  8. create mode 100644 README.md

</source>

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

<source> git merge upstream/master

  1. Updating 34e91da..16c56ad
  2. Fast-forward
  3. README.md | 5 +++--
  4. 1 file changed, 3 insertions(+), 2 deletions(-)

</source>


Rebase

<source> git checkout branch git rebase master

  1. First, rewinding head to replay your work on top of it...
  2. Applying: added staged command

git pull git push </source>

Tags (releases)

Create

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

Delete

<source> git tag

v2.6.6-20130810-rf
v2.6.6-rf
test-tag

</source> <source> git tag -d test-tag

Deleted tag 'test-tag' (was 865ff0f)

</source> <source> git push origin :refs/tags/test-tag

To git@github.com:ljunkie/roku-client-public.git
- [deleted]         test-tag

</source>