Skip to content

Instantly share code, notes, and snippets.

@tmcgilchrist

tmcgilchrist/git-rebase.markdown

Created February 10, 2012 02:58
Show Gist options
  • Save tmcgilchrist/1785908 to your computer and use it in GitHub Desktop.
Save tmcgilchrist/1785908 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. tmcgilchrist revised this gist Jun 7, 2012. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion git-rebase.markdown
    View file
    Original file line number Diff line number Diff line change
    @@ -34,7 +34,7 @@

    ### Git Flow ###

    git flow init # Setup project to use git-flow
    git flow init # setup project to use git-flow

    git flow feature start <feature_name> # creates a new feature branch called <feature_name>

  2. tmcgilchrist revised this gist Jun 7, 2012. 1 changed file with 10 additions and 0 deletions.
    10 changes: 10 additions & 0 deletions git-rebase.markdown
    View file
    Original file line number Diff line number Diff line change
    @@ -32,3 +32,13 @@
    2. git add <resolved files>
    3. git rebase --continue

    ### Git Flow ###

    git flow init # Setup project to use git-flow

    git flow feature start <feature_name> # creates a new feature branch called <feature_name>

    git flow feature finish <feature_name> # merge feature back into develop branch

    git flow release start <version> # merge develop to release

  3. tmcgilchrist revised this gist May 18, 2012. 1 changed file with 4 additions and 0 deletions.
    4 changes: 4 additions & 0 deletions git-rebase.markdown
    View file
    Original file line number Diff line number Diff line change
    @@ -22,6 +22,10 @@
    git merge <branchname>
    git push

    ### Squash Last N Commits ###

    git rebase --interactive HEAD~N

    ### Conflicts ###

    1. Resolve conflict my looking at the files in question.
  4. tmcgilchrist revised this gist Feb 10, 2012. 1 changed file with 5 additions and 0 deletions.
    5 changes: 5 additions & 0 deletions git-rebase.markdown
    View file
    Original file line number Diff line number Diff line change
    @@ -1,18 +1,23 @@
    ### Checkout a new working branch ###
    git checkout -b <branchname>

    ### Make Changes ###

    git add
    git commit -m "description of changes"

    ### Sync with remote ###

    git checkout master
    git pull --rebase

    ### Update branch ###

    git checkout <branchname>
    git rebase master

    ### Push Changes ###

    git checkout master
    git merge <branchname>
    git push
  5. tmcgilchrist revised this gist Feb 10, 2012. 1 changed file with 10 additions and 10 deletions.
    20 changes: 10 additions & 10 deletions git-rebase.markdown
    View file
    Original file line number Diff line number Diff line change
    @@ -1,21 +1,21 @@
    git checkout -b <branchname>
    git checkout -b <branchname>

    ### Make Changes ###
    git add
    git commit -m "description of changes"
    git add
    git commit -m "description of changes"

    ### Sync with remote ###
    git checkout master
    git pull --rebase
    git checkout master
    git pull --rebase

    ### Update branch ###
    git checkout <branchname>
    git rebase master
    git checkout <branchname>
    git rebase master

    ### Push Changes ###
    git checkout master
    git merge <branchname>
    git push
    git checkout master
    git merge <branchname>
    git push

    ### Conflicts ###

  6. tmcgilchrist created this gist Feb 10, 2012.
    25 changes: 25 additions & 0 deletions git-rebase.markdown
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,25 @@
    git checkout -b <branchname>

    ### Make Changes ###
    git add
    git commit -m "description of changes"

    ### Sync with remote ###
    git checkout master
    git pull --rebase

    ### Update branch ###
    git checkout <branchname>
    git rebase master

    ### Push Changes ###
    git checkout master
    git merge <branchname>
    git push

    ### Conflicts ###

    1. Resolve conflict my looking at the files in question.
    2. git add <resolved files>
    3. git rebase --continue