Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [dax@feeder ~]$ cd ckit/
- [dax@feeder ckit]$ git pull
- Enter passphrase for key '/home/dax/.ssh/id_rsa':
- remote: Counting objects: 33, done.
- remote: Compressing objects: 100% (25/25), done.
- remote: Total 29 (delta 8), reused 0 (delta 0)
- Unpacking objects: 100% (29/29), done.
- From github.com:rivaldid/ckit
- 875f56d..be18551 master -> origin/master
- You asked me to pull without telling me which branch you
- want to merge with, and 'branch.master.merge' in
- your configuration file does not tell me, either. Please
- specify which branch you want to use on the command line and
- try again (e.g. 'git pull <repository> <refspec>').
- See git-pull(1) for details.
- If you often merge with the same branch, you may want to
- use something like the following in your configuration file:
- [branch "master"]
- remote = <nickname>
- merge = <remote-ref>
- [remote "<nickname>"]
- url = <url>
- fetch = <refspec>
- See git-config(1) for details.
- [dax@feeder ckit]$ git pull origin master
- Enter passphrase for key '/home/dax/.ssh/id_rsa':
- remote: Counting objects: 3, done.
- remote: Compressing objects: 100% (2/2), done.
- remote: Total 2 (delta 1), reused 0 (delta 0)
- Unpacking objects: 100% (2/2), done.
- From github.com:rivaldid/ckit
- * branch master -> FETCH_HEAD
- Updating 875f56d..a7a2f1e
- Fast-forward
- GPL3 | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- LGPL2.1 | 504 +++++++++++++++++++++++++++++++++++++++++++
- LICENSE-RUBY | 56 +++++
- PKGBUILD | 2 +-
- lib/Test.sh | 155 --------------
- 5 files changed, 1235 insertions(+), 156 deletions(-)
- create mode 100644 GPL3
- create mode 100644 LGPL2.1
- create mode 100644 LICENSE-RUBY
- delete mode 100755 lib/Test.sh
Add Comment
Please, Sign In to add comment