Created
May 4, 2010 22:44
-
-
Save Cam1337/390144 to your computer and use it in GitHub Desktop.
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
cam@g-mac In(~/git/python/pyirc) Time(18:43:18)$ git pull | |
warning: no common commits | |
remote: Counting objects: 1136, done. | |
remote: Compressing objects: 100% (870/870), done. | |
remote: Total 1136 (delta 198), reused 819 (delta 17) | |
Receiving objects: 100% (1136/1136), 173.38 KiB | 104 KiB/s, done. | |
Resolving deltas: 100% (198/198), done. | |
From ssh://ssh.github.com:443/Cam1337/PyIRC | |
* [new branch] 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. | |
cam@g-mac In(~/git/python/pyirc) Time(18:44:14)$ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment