Skip to content

Test #2384

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.

Sign up for GitHub

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

Draft
wants to merge 40 commits into
base: master
Choose a base branch
from
Draft

Test #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
cbe9135
my first commit
WhoIsJohnMichael Mar 22, 2024
b21b11e
ADDING MORE IPSUM TEXT
WhoIsJohnMichael Mar 22, 2024
80ed8aa
added some more ipsum files
WhoIsJohnMichael Mar 22, 2024
737c556
More ipsum from hipsters ayeee
WhoIsJohnMichael Mar 22, 2024
fae337f
again commit hipsum
WhoIsJohnMichael Mar 22, 2024
766efa7
again huhuhuhuh
WhoIsJohnMichael Mar 22, 2024
3273bac
added levels ipsum
WhoIsJohnMichael Mar 22, 2024
33e9de0
renaming level 3 file
WhoIsJohnMichael Mar 22, 2024
4e250a1
renaming level 2 file
WhoIsJohnMichael Mar 22, 2024
91e324b
moving file from level 2 to level 3
WhoIsJohnMichael Mar 22, 2024
98321d3
renamed level 1 file
WhoIsJohnMichael Mar 22, 2024
8d3a0cf
rnamed level1 file
WhoIsJohnMichael Mar 22, 2024
5928105
deleting newfile
WhoIsJohnMichael Mar 22, 2024
25ad168
deleted hipster.txt
WhoIsJohnMichael Mar 22, 2024
2f761ab
deleting level 1 and children
WhoIsJohnMichael Mar 22, 2024
8029715
Added gitignore
WhoIsJohnMichael Mar 22, 2024
fa764e7
Adding copyright
WhoIsJohnMichael Mar 22, 2024
b8b1240
Adding copyright notice
WhoIsJohnMichael Mar 22, 2024
0c57e68
Merge branch 'add-copyright'
WhoIsJohnMichael Mar 22, 2024
3e75441
Adding team member to humans.txt
WhoIsJohnMichael Mar 22, 2024
5094a55
Adding ewan
WhoIsJohnMichael Mar 22, 2024
fe206c7
Merging changes from simple-changes
WhoIsJohnMichael Mar 22, 2024
45d3969
adding lien to readme
WhoIsJohnMichael Mar 22, 2024
f927112
saying thanks
WhoIsJohnMichael Mar 22, 2024
f44a79d
adding another change after rebase
WhoIsJohnMichael Mar 22, 2024
7d0936a
mb before rebase conflict
WhoIsJohnMichael Mar 22, 2024
1c60d3d
mb conflicting changes brewing
WhoIsJohnMichael Mar 22, 2024
960f5a9
adding changes after rebasing conflict
WhoIsJohnMichael Mar 22, 2024
027db64
remote: minor change index
WhoIsJohnMichael Mar 22, 2024
01b025e
local:update simplehtml copyright
WhoIsJohnMichael Mar 22, 2024
9ce31a4
Changing title for stash
WhoIsJohnMichael Mar 22, 2024
2f4d753
Quick fix for readme.md
WhoIsJohnMichael Mar 22, 2024
bd8eb29
Done with simple.html updates
WhoIsJohnMichael Mar 22, 2024
eef738f
Quick fix after stash on readme.md
WhoIsJohnMichael Mar 23, 2024
3d79b32
Updates to humans file after stash
WhoIsJohnMichael Mar 23, 2024
712977f
Changes after git-stash-branch command
WhoIsJohnMichael Mar 23, 2024
be24a9f
Tweaking for tagging example
WhoIsJohnMichael Mar 23, 2024
41a11f5
Updating for tag 1.2
WhoIsJohnMichael Mar 23, 2024
058a6ce
Update README.md
WhoIsJohnMichael Mar 23, 2024
29a71f0
Update README.md
WhoIsJohnMichael Mar 23, 2024
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.yawa
11 changes: 10 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
# Starter Web Repo

This repository is for showing how Git and GitHub work
just for rebasing, then from myfeatures branch too

## Purpose

Sample website with plenty of files for demos
Sample website with plenty of files for demos

## ewan
Kunyare emergency fix after stash.

# copyright @2024
2024 git training. All rights reserved.

# hello
8 changes: 6 additions & 2 deletions humans.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@

# TEAM

<name> -- <role> -- <twitter>
Ringo Starr -- [email protected] -- @ringostarr

# THANKS

<name>
Thanks to my parents andn everyone.

# TECHNOLOGY COLOPHON

HTML5, CSS3
jQuery, Modernizr
Git, NextJS

#MESSAGE
Please send your reviews.
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title></title>
<title>Tweaking for tagging example 2</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

Expand Down Expand Up @@ -45,7 +45,7 @@
<div class="form-group">
<input type="password" placeholder="Password" class="form-control">
</div>
<button type="submit" class="btn btn-success">Sign in</button>
<button type="submit" class="btn btn-success">Login in</button>
</form>
</div><!--/.navbar-collapse -->
</div>
Expand Down
9 changes: 7 additions & 2 deletions simple.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<!DOCTYPE html>
<head>
<title></title>
<!--
COPYRIGHT @2024
-->
<title>Title for Tagging Examples</title>
<link rel="stylesheet" href="css/bootstrap.min.css">
<style>
body {
Expand All @@ -15,10 +18,12 @@
<!-- Content Goes Here -->
<p>
Just some content
Just random master shi
Adding some more changes
</p>
</main>
<footer class="container">
<p>&copy; Company 2014</p>
<p>&copy; Company 2014. Copyrights. All right reserved.</p>
</footer>
</body>
</html>