Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

My feature #12

Open
wants to merge 117 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
fb8e221
Changes :D
Jan 23, 2016
6815d8d
grilled cheese
Jan 23, 2016
637acb7
Adding some stuff...
havk64 Jan 23, 2016
072e194
Actions require parentheses
chandler767 Jan 23, 2016
1672f98
Addds Curtain Down
krisbredemeier Jan 23, 2016
debffae
added list of holberton students for this batch
Jan 23, 2016
7ccd317
Merge pull request #1 from havk64/alexandro
krisbredemeier Jan 23, 2016
28689bb
added dramatic pause
chandler767 Jan 23, 2016
50b9091
added credits with list of students
Jan 23, 2016
faddced
Added my name :)
Jan 23, 2016
af4ecf2
Merge pull request #4 from dalzuga/credits
dalzuga Jan 23, 2016
42e9e02
Do you speak latin?
johnSerrano Jan 23, 2016
5894a28
Merge pull request #8 from johnSerrano/master
chandler767 Jan 23, 2016
7920a31
Merge pull request #6 from chandler767/chandler
johnSerrano Jan 23, 2016
6cc3f93
added more actions
chandler767 Jan 23, 2016
953fe13
grilled cheese
Jan 23, 2016
1b2e052
History channel
johnSerrano Jan 23, 2016
7e2a547
adds smily face
krisbredemeier Jan 23, 2016
a5d6ba9
Merge pull request #1 from chandler767/chandler
chandler767 Jan 23, 2016
138ea41
Update screenplay.txt
nbveroczi Jan 23, 2016
c9a7437
Merge pull request #2 from krisbredemeier/master
IanWagener Jan 23, 2016
7ad3a93
Add shouting message
Jan 23, 2016
a2256a2
adds change made by Bennett
bennettbuchanan Jan 23, 2016
2a0bf11
build an aquarium
johnSerrano Jan 23, 2016
fd8ac13
Cleaned up a little
Jan 23, 2016
ab824fb
Merge branch 'jdeepee-test_branch'
Jan 23, 2016
e61da0d
Add random message
Jan 23, 2016
e199acb
Merge pull request #10 from johnSerrano/master
chandler767 Jan 23, 2016
28d7506
Merge https://github.com/holbertonschoolstudents/discover-git
Jan 23, 2016
7230398
Update screenplay.txt
johnjohn987 Jan 23, 2016
94859ab
Changed enthusiastically to Exclaming
chandler767 Jan 23, 2016
f2b81a9
Simple changes
Jan 23, 2016
62e2572
Merge pull request #16 from jdeepee/master
jdeepee Jan 23, 2016
4a13a64
adds last name
bennettbuchanan Jan 23, 2016
316ea07
commit
chandler767 Jan 23, 2016
0c64df0
Merge pull request #11 from chandler767/master
johnSerrano Jan 23, 2016
a490a2d
Add test at end
Jan 23, 2016
775a169
created separate credits.txt file
Jan 23, 2016
51f4e43
Added second name
Jan 23, 2016
fc98e4c
grilled cheese
Jan 23, 2016
6a8b66d
grilled cheese
Jan 23, 2016
b351875
Merge pull request #5 from IanWagener/master
krisbredemeier Jan 23, 2016
3a22847
Merge pull request #19 from dalzuga/master
bennettbuchanan Jan 23, 2016
1864ec2
Added your second name
Jan 23, 2016
8f6b4f8
Merge pull request #21 from jdeepee/master
chandler767 Jan 23, 2016
e4472b7
Add a test at end
Jan 23, 2016
873535c
Merge pull request #17 from johnjohn987/John-Copy
johnjohn987 Jan 23, 2016
2446e46
Merge pull request #15 from holbertonschoolstudents/bennett_branch
dalzuga Jan 23, 2016
9d091e6
Merge pull request #23 from Praylin/my_branch
johnjohn987 Jan 23, 2016
5cb7889
Just added the zx6r text file
butcallmeJo Jan 23, 2016
fc8c3f7
First commit
nbveroczi Jan 23, 2016
8cbef17
added github accounts of people in the batch's github account
Jan 23, 2016
9aad2fa
Added line January 2016 batch
bilalbarki Jan 23, 2016
cdf2829
Merge pull request #29 from nbveroczi/master
afrancisboeuf Jan 23, 2016
a8dcaad
Merge pull request #27 from dalzuga/master
Praylin Jan 23, 2016
ce2096f
Merge pull request #28 from bilalbarki/my_feature
havk64 Jan 23, 2016
ce6a469
added some basic info about the zx6r motorcycle
butcallmeJo Jan 23, 2016
3cede48
Second commit
nbveroczi Jan 23, 2016
b908e8b
Made grammatical and style corrections
electrachong Jan 23, 2016
b9583e7
Merge branch 'master' into mason
krisbredemeier Jan 23, 2016
f74163b
Merge branch 'mason'
krisbredemeier Jan 23, 2016
31e400c
Merge branch 'master' of github.com:holbertonschoolstudents/discover-git
krisbredemeier Jan 23, 2016
42c5eff
Third commit
nbveroczi Jan 23, 2016
cec8e49
fixed a typo
Jan 23, 2016
e2a6ee0
Merge pull request #37 from electrachong/Electra-1
Praylin Jan 23, 2016
f1be4d4
fixed typo
Jan 23, 2016
05a40f6
removed a repetition
Jan 23, 2016
23025b5
Merge pull request #40 from frakentoaster/master
Jan 23, 2016
9c655cb
Revert "fixed typo"
Jan 23, 2016
7aeba48
removed a repetition
Jan 23, 2016
0c18978
An experimental git file
Jan 23, 2016
213f244
Merge branch 'jo-discover-git'
butcallmeJo Jan 23, 2016
1a83a8c
renamed file to descriptive name
Jan 23, 2016
a1421cf
Merge pull request #43 from dalzuga/renameFiles
dalzuga Jan 23, 2016
8ae85ae
Merge pull request #41 from holbertonschoolstudents/revert-40-master
Praylin Jan 23, 2016
d95b258
added a colon
Jan 23, 2016
de22e49
altered the scriprt format
SravanthiSinha Jan 23, 2016
0c1caf1
Merge pull request #44 from nbveroczi/nomibranch
afrancisboeuf Jan 23, 2016
555855c
pizza
Jan 23, 2016
79a60d9
Merge pull request #1 from dalzuga/renameFiles
dalzuga Jan 23, 2016
d0d7adb
Merge pull request #46 from dalzuga/master
afrancisboeuf Jan 23, 2016
478c63f
Amy knows latin
mason-fish Jan 23, 2016
3f8e7c9
added 'bright'
Jan 23, 2016
427feb2
info
Jan 23, 2016
ca932ec
Merge pull request #48 from WilliamMcCann/william_take_two
Praylin Jan 23, 2016
9fb8451
Merge pull request #47 from mason-fish/mason_branch
mason-fish Jan 23, 2016
0947bf5
Merge pull request #45 from SravanthiSinha/master
SravanthiSinha Jan 23, 2016
86b3f9e
Merge pull request #49 from butcallmeJo/master
butcallmeJo Jan 23, 2016
ae24d8d
wrapped the students list
Jan 23, 2016
58a8c6e
asked a question
madejean Jan 23, 2016
2c7ba7d
My addition to the file
Jan 23, 2016
3d69de4
Merge pull request #1 from afrancisboeuf/wraptext
afrancisboeuf Jan 23, 2016
1a913c8
fetching
Jan 23, 2016
b8762b2
Merge remote-tracking branch 'refs/remotes/origin/master'
Jan 23, 2016
305b29b
Merge pull request #50 from afrancisboeuf/master
nbveroczi Jan 23, 2016
321afe5
add more change text to end
mason-fish Jan 23, 2016
76b64ff
Merge pull request #51 from madejean/marine
madejean Jan 23, 2016
634ddb9
add random text
mason-fish Jan 23, 2016
22fda32
Adding my stuff...
havk64 Jan 23, 2016
3693211
Merge pull request #54 from mason-fish/mason_branch_2
butcallmeJo Jan 23, 2016
e6fd257
edit
madejean Jan 23, 2016
ea1c859
Accepting suggestions from reviewer...
havk64 Jan 23, 2016
aa9e1eb
steven was here
Jan 23, 2016
8ec8873
Merge pull request #56 from havk64/alex
mason-fish Jan 23, 2016
8f80e8c
Merge pull request #60 from stvngrcia/master
dalzuga Jan 23, 2016
96722b2
Merge pull request #59 from madejean/marine
bilalbarki Jan 23, 2016
0d9edc4
Edited the file
Jan 23, 2016
4068b5f
Removed random text
butcallmeJo Jan 23, 2016
be62362
Merge remote-tracking branch 'upstream/master' into rickharris-dev-ri…
rickharris-dev Jan 23, 2016
0d338b2
Merge branch 'rickharris-dev-rick_harris' into rick_harris
rickharris-dev Jan 23, 2016
408cf07
added a line
bilalbarki Jan 23, 2016
2207952
Merge pull request #63 from Praylin/expbranch
afrancisboeuf Jan 23, 2016
94386a5
Merge pull request #52 from rickharris-dev/rick_harris
nbveroczi Jan 23, 2016
7f6d059
Merge pull request #65 from bilalbarki/my_feature
madejean Jan 23, 2016
0f20664
Revert "added a line"
madejean Jan 23, 2016
7b42247
Merge pull request #68 from holbertonschoolstudents/revert-65-my_feature
madejean Jan 23, 2016
7110ea2
added a line
bilalbarki Jan 23, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions screenplay.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
A FIRST DAY AT HOLBERTON SCHOOL
steven was here
bilal was here
or

GIT: you know you love it!