Skip to content

Instantly share code, notes, and snippets.

@larsberg

larsberg/git-overwrite-branch.sh

Forked from brev/git-overwrite-branch.sh
Created October 27, 2015 18:59
Show Gist options
  • Save larsberg/6f987b2426e9f2461007 to your computer and use it in GitHub Desktop.
Save larsberg/6f987b2426e9f2461007 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. @brev brev renamed this gist May 14, 2015. 1 changed file with 0 additions and 0 deletions.
    0 gistfile1.txt → git-overwrite-branch.sh
    View file
    File renamed without changes.
  2. @brev brev created this gist May 14, 2015.
    5 changes: 5 additions & 0 deletions gistfile1.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,5 @@
    # overwrite master with contents of seotweaks branch (seotweaks > master)
    git checkout seotweaks # source name
    git merge -s ours master # target name
    git checkout master # target name
    git merge seotweaks # source name