Guest User

Untitled

a guest
Jul 23rd, 2018
73
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.73 KB | None | 0 0
  1. [dax@feeder ~]$ cd ckit/
  2. [dax@feeder ckit]$ git pull
  3. Enter passphrase for key '/home/dax/.ssh/id_rsa':
  4. remote: Counting objects: 33, done.
  5. remote: Compressing objects: 100% (25/25), done.
  6. remote: Total 29 (delta 8), reused 0 (delta 0)
  7. Unpacking objects: 100% (29/29), done.
  8. From github.com:rivaldid/ckit
  9. 875f56d..be18551 master -> origin/master
  10. You asked me to pull without telling me which branch you
  11. want to merge with, and 'branch.master.merge' in
  12. your configuration file does not tell me, either. Please
  13. specify which branch you want to use on the command line and
  14. try again (e.g. 'git pull <repository> <refspec>').
  15. See git-pull(1) for details.
  16.  
  17. If you often merge with the same branch, you may want to
  18. use something like the following in your configuration file:
  19.  
  20. [branch "master"]
  21. remote = <nickname>
  22. merge = <remote-ref>
  23.  
  24. [remote "<nickname>"]
  25. url = <url>
  26. fetch = <refspec>
  27.  
  28. See git-config(1) for details.
  29. [dax@feeder ckit]$ git pull origin master
  30. Enter passphrase for key '/home/dax/.ssh/id_rsa':
  31. remote: Counting objects: 3, done.
  32. remote: Compressing objects: 100% (2/2), done.
  33. remote: Total 2 (delta 1), reused 0 (delta 0)
  34. Unpacking objects: 100% (2/2), done.
  35. From github.com:rivaldid/ckit
  36. * branch master -> FETCH_HEAD
  37. Updating 875f56d..a7a2f1e
  38. Fast-forward
  39. GPL3 | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  40. LGPL2.1 | 504 +++++++++++++++++++++++++++++++++++++++++++
  41. LICENSE-RUBY | 56 +++++
  42. PKGBUILD | 2 +-
  43. lib/Test.sh | 155 --------------
  44. 5 files changed, 1235 insertions(+), 156 deletions(-)
  45. create mode 100644 GPL3
  46. create mode 100644 LGPL2.1
  47. create mode 100644 LICENSE-RUBY
  48. delete mode 100755 lib/Test.sh
Add Comment
Please, Sign In to add comment