Created
September 2, 2013 01:48
-
-
Save tdbrian/6408572 to your computer and use it in GitHub Desktop.
Git merge certain files from another branch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git branch | |
* master | |
twitter_integration | |
$ git checkout twitter_integration app/models/avatar.rb db/migrate/20090223104419_create_avatars.rb test/unit/models/avatar_test.rb test/functional/models/avatar_test.rb | |
$ git status | |
# On branch master | |
# Changes to be committed: | |
# (use "git reset HEAD <file>..." to unstage) | |
# | |
# new file: app/models/avatar.rb | |
# new file: db/migrate/20090223104419_create_avatars.rb | |
# new file: test/functional/models/avatar_test.rb | |
# new file: test/unit/models/avatar_test.rb | |
# | |
$ git commit -m "'Merge' avatar code from 'twitter_integration' branch" | |
[master]: created 4d3e37b: "'Merge' avatar code from 'twitter_integration' branch" | |
4 files changed, 72 insertions(+), 0 deletions(-) | |
create mode 100644 app/models/avatar.rb | |
create mode 100644 db/migrate/20090223104419_create_avatars.rb | |
create mode 100644 test/functional/models/avatar_test.rb | |
create mode 100644 test/unit/models/avatar_test.rb |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment