1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
|
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 <branch>] [-m <master>] [-f] [--mirror] <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
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 <file>..." to update what will be committed)
# (use "git checkout -- <file>..." 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 <file>..." to update what will be committed)
# (use "git checkout -- <file>..." 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 <file>..." 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 <file>..." 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 <misko@hevery.com>
Date: Mon Jan 31 16:21:29 2011 -0800
changed the documentation @example to use <doc:example>
commit ed768ebc53ef6746ca83d81892c22d2e9c3afeef
Author: Misko Hevery <misko@hevery.com>
Date: Mon Jan 31 11:55:44 2011 -0800
Developer guide documentation
commit 9fd3dfe49d283c136e29bf60c0da6d4fe2aaed3d
Author: Igor Minar <iiminar@gmail.com>
Date: Tue Feb 1 07:43:09 2011 -0800
add support for $route.reload()
Closes 254
commit d7686a429c43fd031a0d39788973f726d74bdb33
Author: Igor Minar <iiminar@gmail.com>
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 <file>..." 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 <file>..." 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] [+<line number>] ...
+<line number>
-b, --background
--clean
-c, --create
-e, --encoding <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 <janetdavies@Janet-Daviess-MacBook-Pro.local>
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 <you@example.com>'
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
|
