Skip to content
This repository has been archived by the owner on Aug 20, 2020. It is now read-only.

take it back now y'all #30

Open
wants to merge 90 commits into
base: turtlelib
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
040619d
added a comment
jwest60 Oct 1, 2019
925340c
added hello world print
RetnuhFeel Oct 1, 2019
7e57cb3
good change
cmathew9 Oct 1, 2019
9e1d26d
updated hello world
cbaker33 Oct 1, 2019
a466f62
Implement some funcs
rhettmturner Oct 1, 2019
e8698b6
my good change
cmathew9 Oct 1, 2019
c8e8639
racheals commit
rdylewsk Oct 1, 2019
f13ee20
this is a commit
rainhaworth Oct 1, 2019
dc81827
Zoinks!
isikkema Oct 1, 2019
a622c9b
Yo dog
MattBianchi Oct 1, 2019
d3634a2
test commit
jherman1997 Oct 1, 2019
90d33c0
Added functions
Oct 1, 2019
9add511
Implemented helloworld
paulccote Oct 1, 2019
1da01fe
Damian Seals made a fix
Oct 1, 2019
e0ed69a
why
tkirby11 Oct 1, 2019
0d10bcb
Creating kishan.py
Ktailor34 Oct 1, 2019
a8197ea
Fixed adding I thonk :think:
alambe22 Oct 1, 2019
12b6390
Merge branch 'master' of https://github.com/utk-cs/cs340-git-demo
nhobson99 Oct 1, 2019
0112726
um
rhettmturner Oct 1, 2019
f718faf
fixed hello world
jherman1997 Oct 1, 2019
b70390d
Zoinks...
isikkema Oct 1, 2019
cf5853b
haha yes
rainhaworth Oct 1, 2019
74822d6
Changed helloworld
jacob-duffy Oct 1, 2019
74135f4
Merge pull request #3 from utk-cs/isaac-zoinks
isikkema Oct 1, 2019
cd87515
update hello
neelyjor Oct 1, 2019
a12ac88
A comment was added
aknigh20 Oct 1, 2019
b8309cb
added hi
apark8 Oct 1, 2019
2d4b6c5
implemented hello world function
bchance1 Oct 1, 2019
6233271
This did nothing
Oct 1, 2019
ee17224
committed comment
drainbolt Oct 1, 2019
102c5b2
Added a new file
Abhi-Ravi Oct 1, 2019
0f44699
Fixed for real this time
alambe22 Oct 1, 2019
1b79ccb
edited hello added adding functions
mblaketerry Oct 1, 2019
9b91167
participation cred
brinkofawesomeness Oct 1, 2019
55707c1
commit
Oct 1, 2019
a70be74
zonk
imml3457 Oct 1, 2019
e8ac00e
Merge branch 'master' of https://github.com/utk-cs/cs340-git-demo
Oct 1, 2019
588a91f
commented
phicks6 Oct 1, 2019
629ad34
test commit
mblaketerry Oct 1, 2019
b06142c
merge conflicts resolved
Oct 1, 2019
223a193
made some important fixes
phicks6 Oct 1, 2019
3786e11
Merge remote-tracking branch 'origin/master' into alex-fix-add_numbers
robobenklein Oct 1, 2019
2d15432
You need a readme my dude
nhobson99 Oct 1, 2019
7ffb3f7
Merge pull request #9 from utk-cs/alex-fix-add_numbers
alambe22 Oct 1, 2019
327db53
Merge remote-tracking branch 'origin/master' into cmat-fix-main
robobenklein Oct 1, 2019
4f1dd99
Merge pull request #60 from utk-cs/cmat-fix-main
robobenklein Oct 2, 2019
a11e074
Merge branch 'master' into Damian-Seals-fix
robobenklein Oct 2, 2019
7be7ec5
Merge pull request #1 from utk-cs/Damian-Seals-fix
robobenklein Oct 2, 2019
61b37db
Merge branch 'master' into racheal
robobenklein Oct 2, 2019
1b6b68e
Merge pull request #57 from utk-cs/racheal
robobenklein Oct 2, 2019
cb2ae38
Merge branch 'master' into ch_demo
robobenklein Oct 2, 2019
7927684
Merge pull request #55 from utk-cs/ch_demo
robobenklein Oct 2, 2019
c19617b
Merge pull request #51 from utk-cs/participation
robobenklein Oct 2, 2019
d0e9859
Merge branch 'master' into blakebranch1
robobenklein Oct 2, 2019
7142db6
Merge pull request #54 from utk-cs/blakebranch1
robobenklein Oct 2, 2019
4e6cb3c
Merge pull request #52 from utk-cs/isaac-zoinks
robobenklein Oct 2, 2019
99bbca4
Merge branch 'master' into bchance1
robobenklein Oct 2, 2019
f0f43d2
Merge pull request #46 from utk-cs/bchance1
robobenklein Oct 2, 2019
315c9fd
Merge pull request #45 from utk-cs/abhi
robobenklein Oct 2, 2019
181c21c
Merge branch 'master' into rf-new-branch
robobenklein Oct 2, 2019
f5e2ccc
Merge pull request #44 from utk-cs/rf-new-branch
robobenklein Oct 2, 2019
69466f7
Merge branch 'master' into commenthere
robobenklein Oct 2, 2019
f4e4a98
Merge pull request #40 from utk-cs/commenthere
robobenklein Oct 2, 2019
91b0433
Merge branch 'master' into austin-fix
robobenklein Oct 2, 2019
5c94056
Merge pull request #39 from utk-cs/austin-fix
robobenklein Oct 2, 2019
95fc5ec
Merge pull request #38 from utk-cs/drainbolt-patch-1
robobenklein Oct 2, 2019
e423c09
Merge branch 'master' into cursed-branch
robobenklein Oct 2, 2019
b441b0d
Merge pull request #2 from utk-cs/cursed-branch
robobenklein Oct 2, 2019
7138c5b
Merge branch 'master' into hunter-helloworld
robobenklein Oct 2, 2019
18650be
Merge pull request #4 from utk-cs/hunter-helloworld
robobenklein Oct 2, 2019
63ca236
Merge branch 'master' into jherman4-test-branch
robobenklein Oct 2, 2019
bc2a504
Merge pull request #8 from utk-cs/jherman4-test-branch
robobenklein Oct 2, 2019
cd603ce
Merge branch 'master' into rhett-fix-main
robobenklein Oct 2, 2019
be0af51
Merge pull request #11 from utk-cs/rhett-fix-main
robobenklein Oct 2, 2019
11c625d
Merge branch 'master' into cmb-helloworld
robobenklein Oct 2, 2019
48f3999
Merge pull request #13 from utk-cs/cmb-helloworld
robobenklein Oct 2, 2019
2d18248
Merge pull request #14 from utk-cs/kishan
robobenklein Oct 2, 2019
a2e08b9
Merge branch 'master' into tanner-kirby
robobenklein Oct 2, 2019
0440218
Merge pull request #20 from utk-cs/tanner-kirby
robobenklein Oct 2, 2019
0eca1ce
Merge branch 'master' into paul-write-helloworld
robobenklein Oct 2, 2019
26b5597
Merge pull request #23 from utk-cs/paul-write-helloworld
robobenklein Oct 2, 2019
d5141c8
Merge branch 'master' into daniel-fix-main
robobenklein Oct 2, 2019
e4f8fec
Merge pull request #26 from utk-cs/daniel-fix-main
robobenklein Oct 2, 2019
77d420f
Merge pull request #29 from utk-cs/hcnarb
robobenklein Oct 2, 2019
adf0611
Merge branch 'master' into matt-fix-main
robobenklein Oct 2, 2019
42794c0
Merge pull request #32 from utk-cs/matt-fix-main
robobenklein Oct 2, 2019
8b05cb1
Merge branch 'master' into jn-helloworld
robobenklein Oct 2, 2019
f69975e
Merge pull request #34 from utk-cs/jn-helloworld
robobenklein Oct 2, 2019
407cfb9
Merge branch 'master' into jduffy3-fix
Oct 14, 2019
b431843
Merge pull request #37 from utk-cs/jduffy3-fix
Oct 14, 2019
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
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# cs340-git-demo
Git presentation demo repo

You want a readme? I'm sure you do

<b>bold text</b>

<i>italic text</i>

# big text

-noah
1 change: 1 addition & 0 deletions dontopenthis.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
##why did you open this
41 changes: 38 additions & 3 deletions hello.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,46 @@

#!/usr/bin/env python3
# this is a test comment


# aaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbb
def helloworld():
pass
print('hello')
print("What up dude")
print("Hello")
print("Hello, World!")
#why are we still here, just to suffer
print("Hello world!")
print("Hello!")
print("Hello World")
print("hallo, welt!")
print("hi")
#help me I am trapped somewhere and only have access to this terminal
#this
print("Hello World!")
print('helloworld')
print("hello")

def add_numbers(x, y):
pass
#does
x = x + y
y = 1 + x
z = 1 + 1
print(x + y)
return x + y

def zoinks(zoinks):
print("Zoinks...")
zoinks(zoinks)

def printnothing(a,b,c):
print("")

if __name__ == '__main__':
# do something!
pass
#or mabye not
# no it doesn't
print(":)")
helloworld()

add_numbers(5, 10)
1 change: 1 addition & 0 deletions junk.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hello
1 change: 1 addition & 0 deletions kishan.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
print("Welcome to Kishan's World")
17 changes: 17 additions & 0 deletions zonk.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env python3

def helloworld():
pass

def add_numbers(x, y):
x = x + y
pass

if __name__ == '__main__':
# do something!
pass

def zonks2(zonks2):
zonks2 = zonks2 + zonks1;
return zonks1;