Skip to content

Instantly share code, notes, and snippets.

@scorpp

scorpp/git merge a subdirectory

Last active December 19, 2015 09:39
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save scorpp/5934641 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save scorpp/5934641 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. scorpp revised this gist Jul 5, 2013. 1 changed file with 1 addition and 0 deletions.
    1 change: 1 addition & 0 deletions git merge a subdirectory
    View file
    Original file line number Diff line number Diff line change
    @@ -1,3 +1,4 @@
    # http://stackoverflow.com/a/12048161/679052
    $ git remote add Bar /path/to/bar
    $ git merge -s ours --no-commit Bar/master
    $ git read-tree --prefix=public/bar -u Bar/master:www/tools/
  2. scorpp renamed this gist Jul 5, 2013. 1 changed file with 0 additions and 0 deletions.
    0 gistfile1.sh → git merge a subdirectory
    View file
    File renamed without changes.
  3. scorpp created this gist Jul 5, 2013.
    3 changes: 3 additions & 0 deletions gistfile1.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,3 @@
    $ git remote add Bar /path/to/bar
    $ git merge -s ours --no-commit Bar/master
    $ git read-tree --prefix=public/bar -u Bar/master:www/tools/