Created
February 3, 2012 05:17
-
-
Save veev/1728271 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
Switched to branch 'veev' | |
172-26-12-137:AppropriatingNewTechnologies genevieve$ git remote | |
origin | |
upstream | |
172-26-12-137:AppropriatingNewTechnologies genevieve$ git remote https://github.com/stpn/AppropriatingNewTechnologies.git | |
error: Unknown subcommand: https://github.com/stpn/AppropriatingNewTechnologies.git | |
usage: git remote [-v | --verbose] | |
or: git remote add [-t <branch>] [-m <master>] [-f] [--mirror=<fetch|push>] <name> <url> | |
or: git remote rename <old> <new> | |
or: git remote rm <name> | |
or: git remote set-head <name> (-a | -d | <branch>) | |
or: git remote [-v | --verbose] show [-n] <name> | |
or: git remote prune [-n | --dry-run] <name> | |
or: git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...] | |
or: git remote set-branches <name> [--add] <branch>... | |
or: git remote set-url <name> <newurl> [<oldurl>] | |
or: git remote set-url --add <name> <newurl> | |
or: git remote set-url --delete <name> <url> | |
-v, --verbose be verbose; must be placed before a subcommand | |
172-26-12-137:AppropriatingNewTechnologies genevieve$ git remote add stepan https://github.com/stpn/AppropriatingNewTechnologies.git | |
172-26-12-137:AppropriatingNewTechnologies genevieve$ git checkout | |
172-26-12-137:AppropriatingNewTechnologies genevieve$ git status | |
# On branch veev | |
nothing to commit (working directory clean) | |
172-26-12-137:AppropriatingNewTechnologies genevieve$ git checkout master | |
Switched to branch 'master' | |
Your branch is ahead of 'origin/master' by 6 commits. | |
172-26-12-137:AppropriatingNewTechnologies genevieve$ git checkout -b stepan | |
Switched to a new branch 'stepan' | |
172-26-12-137:AppropriatingNewTechnologies genevieve$ git pull stepan master | |
remote: Counting objects: 170, done. | |
remote: Compressing objects: 100% (119/119), done. | |
remote: Total 163 (delta 51), reused 145 (delta 33) | |
Receiving objects: 100% (163/163), 4.87 MiB | 1006 KiB/s, done. | |
Resolving deltas: 100% (51/51), completed with 6 local objects. | |
From https://github.com/stpn/AppropriatingNewTechnologies | |
* branch master -> FETCH_HEAD | |
Updating bc29da3..fa0a21b | |
error: The following untracked working tree files would be overwritten by merge: | |
week1/ScreenGrab/bin/data/.gitignore | |
Please move or remove them before you can merge. | |
Aborting | |
172-26-12-137:AppropriatingNewTechnologies genevieve$ git pull stepan master | |
From https://github.com/stpn/AppropriatingNewTechnologies | |
* branch master -> FETCH_HEAD | |
Updating bc29da3..fa0a21b | |
error: The following untracked working tree files would be overwritten by merge: | |
week1/ScreenGrab/bin/data/.gitignore | |
Please move or remove them before you can merge. | |
Aborting | |
172-26-12-137:AppropriatingNewTechnologies genevieve$ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment