Guest User

Untitled

a guest
Apr 22nd, 2018
213
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.10 KB | None | 0 0
  1. iMac:zeta somazx$ git pull
  2. remote: Counting objects: 9, done.
  3. remote: Compressing objects: 100% (5/5), done.
  4. remote: Total 5 (delta 4), reused 0 (delta 0)
  5. Unpacking objects: 100% (5/5), done.
  6. From git+ssh://git@git.isohunt.com/int/zeta-code
  7. fea1b10..285f0a5 master -> origin/master
  8. You asked me to pull without telling me which branch you
  9. want to merge with, and 'branch..merge' in
  10. your configuration file does not tell me either. Please
  11. name which branch you want to merge on the command line and
  12. try again (e.g. 'git pull <repository> <refspec>').
  13. See git-pull(1) for details on the refspec.
  14.  
  15. If you often merge with the same branch, you may want to
  16. configure the following variables in your configuration
  17. file:
  18.  
  19. branch..remote = <nickname>
  20. branch..merge = <remote-ref>
  21. remote.<nickname>.url = <url>
  22. remote.<nickname>.fetch = <refspec>
  23.  
  24. See git-config(1) for details.
  25. iMac:zeta somazx$ git status
  26. # Not currently on any branch.
  27. # Changed but not updated:
  28. # (use "git add <file>..." to update what will be committed)
  29. #
  30. # modified: app/helpers/application_helper.rb
Add Comment
Please, Sign In to add comment