Skip to content

Instantly share code, notes, and snippets.

@tavlima

tavlima/gist:4724533

Created February 6, 2013 18:08
Show Gist options
  • Save tavlima/4724533 to your computer and use it in GitHub Desktop.
Save tavlima/4724533 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. tavlima created this gist Feb 6, 2013.
    5 changes: 5 additions & 0 deletions gistfile1.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,5 @@
    # "Merge" a single file from another branch (won't merge the history!!!)
    $ git checkout BRANCH path/filename

    # List the files changed between branches
    $ git diff --name-status BRANCH_A BRANCH_B