Last login: Tue Feb 1 13:42:41 on ttys000 Janet-Daviess-MacBook-Pro:~ janetdavies$ cd angular.js/ Janet-Daviess-MacBook-Pro:angular.js janetdavies$ ./gen_docs.sh ./gen_docs.sh: line 2: /Users/janetdavies/.bashrc: No such file or directory (node) process.compile should not be used. Use require('vm').runInThisContext instead. Started .............................................. Finished in 0.028 seconds 27 tests, 76 assertions, 0 failures (node) process.compile should not be used. Use require('vm').runInThisContext instead. Generating Angular Reference Documentation... DONE. Generated 136 pages in 354ms. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git remote origin Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git remote -v origin git@github.com:jedplus/angular.js.git (fetch) origin git@github.com:jedplus/angular.js.git (push) Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git remote -? error: unknown switch `?' usage: git remote [-v | --verbose] or: git remote add [-t ] [-m ] [-f] [--mirror] or: git remote rename or: git remote rm or: git remote set-head (-a | -d | ) or: git remote [-v | --verbose] show [-n] or: git remote prune [-n | --dry-run] or: git remote [-v | --verbose] update [-p | --prune] [( | )...] or: git remote set-branches [--add] ... or: git remote set-url [] or: git remote set-url --add or: git remote set-url --delete -v, --verbose be verbose; must be placed before a subcommand Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git remote add upstream https://github.com/angular/angular.js.git Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git remote -v origin git@github.com:jedplus/angular.js.git (fetch) origin git@github.com:jedplus/angular.js.git (push) upstream https://github.com/angular/angular.js.git (fetch) upstream https://github.com/angular/angular.js.git (push) Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git status # On branch master # Changed but not updated: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: docs/angular.ngdoc # no changes added to commit (use "git add" and/or "git commit -a") Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git diff diff --git a/docs/angular.ngdoc b/docs/angular.ngdoc index 3f342d1..00d94da 100644 --- a/docs/angular.ngdoc +++ b/docs/angular.ngdoc @@ -2,3 +2,5 @@ @ngdoc overview @name angular @namespace The exported angular namespace. +@description +Hello Description Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git checkout -b newbie M docs/angular.ngdoc Switched to a new branch 'newbie' Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git status # On branch newbie # Changed but not updated: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: docs/angular.ngdoc # no changes added to commit (use "git add" and/or "git commit -a") Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git add . Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git status # On branch newbie # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: docs/angular.ngdoc # Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git commit Aborting commit due to empty commit message. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ open TextWrangler The file /Users/janetdavies/angular.js/TextWrangler does not exist. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ open TextWrangler.app The file /Users/janetdavies/angular.js/TextWrangler.app does not exist. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ open ~/Applications/ Janet-Daviess-MacBook-Pro:angular.js janetdavies$ open /Applications/TextWrangler.app Janet-Daviess-MacBook-Pro:angular.js janetdavies$ ls CHANGELOG.md logs LICENSE nodeserver.sh README.md perf Rakefile regression angularjs.ftp scenario build server-coverage.sh css server.sh docs src example test gen_docs.sh test-coverage.sh images test-perf.sh java test.sh jsTestDriver-coverage.conf tmp jsTestDriver-jquery.conf version.yaml jsTestDriver-perf.conf watchr-docs.rb jsTestDriver.conf watchr.rb lib Janet-Daviess-MacBook-Pro:angular.js janetdavies$ vi ~/.bash_history Janet-Daviess-MacBook-Pro:angular.js janetdavies$ vi ~/ Janet-Daviess-MacBook-Pro:angular.js janetdavies$ Janet-Daviess-MacBook-Pro:angular.js janetdavies$ Janet-Daviess-MacBook-Pro:angular.js janetdavies$ vi ~/.gitconfig Janet-Daviess-MacBook-Pro:angular.js janetdavies$ edit ~/.gitconfig Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git commit edit: error: -609 error: There was a problem with the editor 'edit'. Please supply the message using either -m or -F option. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git commit Aborting commit due to empty commit message. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git commit Aborting commit due to empty commit message. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git status # On branch newbie # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: docs/angular.ngdoc # Janet-Daviess-MacBook-Pro:angular.js janetdavies$ history 1 cd .ssh 2 ls 3 mkdir .ssh 4 chmod 700 .ssh 5 ls 6 ls -al .ssh 7 cd .ssh 8 ssh -keygen 9 ssh-keygen -t rsa -C janet.davies11@gmail.com 10 cat id_rsa.pub 11 cd 12 git clone git@github.com:jedplus/angular.js.git 13 cd angular.js/ 14 ./gen_docs.sh 15 rake compile 16 cd angular.js/ 17 ./nodeserver.sh 18 cd angular.js/ 19 ./gen_docs.sh 20 git remote 21 git remote -v 22 git remote -? 23 git remote add upstream https://github.com/angular/angular.js.git 24 git remote -v 25 git status 26 git diff 27 git checkout -b newbie 28 git status 29 git add . 30 git status 31 git commit 32 open TextWrangler 33 open TextWrangler.app 34 open /Applications/TextWrangler.app 35 ls 36 vi ~/.gitconfig 37 edit ~/.gitconfig 38 git commit 39 git commit 40 git commit 41 git status 42 history Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git log commit ba6b68b6ae2bb2400a75ca2834fee47bfd60f1c6 Author: Misko Hevery Date: Mon Jan 31 16:21:29 2011 -0800 changed the documentation @example to use commit ed768ebc53ef6746ca83d81892c22d2e9c3afeef Author: Misko Hevery Date: Mon Jan 31 11:55:44 2011 -0800 Developer guide documentation commit 9fd3dfe49d283c136e29bf60c0da6d4fe2aaed3d Author: Igor Minar Date: Tue Feb 1 07:43:09 2011 -0800 add support for $route.reload() Closes 254 commit d7686a429c43fd031a0d39788973f726d74bdb33 Author: Igor Minar Date: Mon Jan 31 23:48:04 2011 -0800 add $route.parent for setting parentScope [1]+ Stopped git log Janet-Daviess-MacBook-Pro:angular.js janetdavies$ Janet-Daviess-MacBook-Pro:angular.js janetdavies$ Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git status # On branch newbie # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: docs/angular.ngdoc # Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git add . Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git status # On branch newbie # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: docs/angular.ngdoc # Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git commit Aborting commit due to empty commit message. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git commit Aborting commit due to empty commit message. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git commit Aborting commit due to empty commit message. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git commit Aborting commit due to empty commit message. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git commit Aborting commit due to empty commit message. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git commit Aborting commit due to empty commit message. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ edit --? Usage: edit [-bcehlpuvVw] [+] ... + -b, --background --clean -c, --create -e, --encoding -h, --help -l, --launch -p, --print --resume -t, --pipe-title -u, --create-unix -v, --version --view-top -V, --short-version -w, --wait --front-window --new-window --separate-windows Janet-Daviess-MacBook-Pro:angular.js janetdavies$ edit ~/.gitconfig Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git commit [newbie 3123f8e] my frist message Committer: Janet Davies Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you@example.com If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name ' 1 files changed, 2 insertions(+), 0 deletions(-) Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git config --global user.name "Janet Davies"" > git config --global user.email janet.davies11@gmail.com > git push origin nodeserver.sh .DS_Store docs/ scenario/ .externalToolBuilders/ example/ server-coverage.sh .git/ gen_docs.sh server.sh .gitignore images/ src/ .idea/ java test/ .project jsTestDriver-coverage.conf test-coverage.sh .settings/ jsTestDriver-jquery.conf test-perf.sh CHANGELOG.md jsTestDriver-perf.conf test.sh LICENSE jsTestDriver.conf tmp/ README.md lib/ version.yaml Rakefile logs/ watchr-docs.rb angularjs.ftp nodeserver.sh watchr.rb build/ perf/ css/ regression/ > git status > > > > ls > Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git config --global user.name "Janet Davies"Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git config --global user.email janet.davies11@gmail.com Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git status # On branch newbie nothing to commit (working directory clean) Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git push origin newbie Counting objects: 7, done. Delta compression using up to 2 threads. Compressing objects: 100% (4/4), done. Writing objects: 100% (4/4), 392 bytes, done. Total 4 (delta 3), reused 0 (delta 0) To git@github.com:jedplus/angular.js.git * [new branch] newbie -> newbie Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git push origin newbie Janet-Daviess-MacBook-Pro:angular.js janetdavies$ history 1 cd .ssh 2 ls 3 mkdir .ssh 4 chmod 700 .ssh 5 ls 6 ls -al .ssh 7 cd .ssh 8 ssh -keygen 9 ssh-keygen -t rsa -C janet.davies11@gmail.com 10 cat id_rsa.pub 11 cd 12 git clone git@github.com:jedplus/angular.js.git 13 cd angular.js/ 14 ./gen_docs.sh 15 rake compile 16 cd angular.js/ 17 ./nodeserver.sh 18 cd angular.js/ 19 ./gen_docs.sh 20 git remote 21 git remote -v 22 git remote -? 23 git remote add upstream https://github.com/angular/angular.js.git 24 git remote -v 25 git status 26 git diff 27 git checkout -b newbie 28 git status 29 git add . 30 git status 31 git commit 32 open TextWrangler 33 open TextWrangler.app 34 open /Applications/TextWrangler.app 35 ls 36 vi ~/.gitconfig 37 edit ~/.gitconfig 38 git commit 39 git commit 40 git commit 41 git status 42 history 43 git log 44 git status 45 git add . 46 git status 47 git commit 48 git commit 49 git commit 50 git commit 51 git commit 52 git commit 53 edit --? 54 edit ~/.gitconfig 55 git commit 56 git config --global user.name "Janet Davies"" git config --global user.email janet.davies11@gmail.com git status ls 57 git config --global user.name "Janet Davies" 58 git config --global user.email janet.davies11@gmail.com 59 git status 60 git push origin newbie 61 history Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git checkout master Switched to branch 'master' Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git status # On branch master nothing to commit (working directory clean) Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git pull upstream master From https://github.com/angular/angular.js * branch master -> FETCH_HEAD Already up-to-date. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git pull upstream From https://github.com/angular/angular.js * [new branch] gh-pages -> upstream/gh-pages * [new branch] master -> upstream/master You asked to pull from the remote 'upstream', but did not specify a branch. Because this is not the default configured remote for your current branch, you must specify a branch on the command line. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git pull upstream master From https://github.com/angular/angular.js * branch master -> FETCH_HEAD Already up-to-date. Janet-Daviess-MacBook-Pro:angular.js janetdavies$ git checkout master