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.

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

Adding a README file #2413

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
+32 −9
Open

Adding a README file #2413

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
7246a0a
My first commit
DJlazcano Jul 29, 2024
8addbdc
Adding more ipsum text
DJlazcano Jul 29, 2024
884e605
adding new features
DJlazcano Jul 29, 2024
c027777
Adding several files recursively
DJlazcano Jul 29, 2024
9eecf67
remaning level3 file
DJlazcano Jul 29, 2024
ab3da40
renaming level2 file
DJlazcano Jul 29, 2024
493b782
moving file from level2 to level3
DJlazcano Jul 29, 2024
7ea7e58
moving level2 file from level3 to level2
DJlazcano Jul 29, 2024
c23c260
removing with file explorer
DJlazcano Jul 29, 2024
9888014
delete file
DJlazcano Jul 29, 2024
d7e7f35
new file deleted
DJlazcano Jul 29, 2024
f3f642d
deleted hipster.txt
DJlazcano Jul 29, 2024
e1f2026
delted files
DJlazcano Jul 29, 2024
1603528
Adding gitignore file to exclude unwanted files
DJlazcano Jul 29, 2024
f284a59
Adding README file
DJlazcano Jul 30, 2024
f8bcef2
README introduction
DJlazcano Jul 30, 2024
bb02cf8
File changed
DJlazcano Jul 30, 2024
b1b3b4d
changing html title
DJlazcano Jul 30, 2024
abdf65a
Adding copyright notice
DJlazcano Jul 30, 2024
a0b2636
Adding copyright notice to README
DJlazcano Jul 30, 2024
744c166
Merge branch 'add-copyright'
DJlazcano Jul 30, 2024
873e92a
Adding team member to humans.txt
DJlazcano Jul 30, 2024
e815313
Adding instructions on how to Contribute
DJlazcano Jul 30, 2024
78de015
Merging Changes from simple-changes branch
DJlazcano Jul 30, 2024
3b503a5
Changes to html
DJlazcano Jul 30, 2024
dabb883
conflicts
DJlazcano Jul 30, 2024
a3d355b
update
DJlazcano Jul 30, 2024
e19d004
added edit to the README
DJlazcano Jul 30, 2024
b4c8816
Saying thanks to all
DJlazcano Jul 30, 2024
32d1f82
Adding more text
DJlazcano Jul 30, 2024
608b23e
remote: Update index.html
DJlazcano Jul 30, 2024
c230e28
local: update
DJlazcano Jul 30, 2024
6b9298c
fix in pruduction
DJlazcano Jul 30, 2024
3888e9b
git unstashed changes
DJlazcano Jul 30, 2024
3ee7233
Quick fix after stash readme file
DJlazcano Jul 30, 2024
40f0ba1
Updates to Humans file after stash pop
DJlazcano Jul 30, 2024
0622492
Changes after git-stash-branch command
DJlazcano Jul 30, 2024
34b4fb2
adding tag to commit
DJlazcano Jul 30, 2024
ded8ef1
Updating for tags 21.1
DJlazcano Jul 30, 2024
d336b23
More content to README File
DJlazcano Jul 31, 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 @@
a.txt
Empty file added New Text Document.txt
View file
Open in desktop
Empty file.
16 changes: 14 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
# Starter Web Repo

This repository is for showing how Git and GitHub work
This repository is for showing how Git and GitHub work, and more

## Purpose

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

## How to Contribute
Fork Repository and issue pull request

## Training and Learning

Git guide

### Copyright

Copyright RESERVED 2024, all Rights Reserved FOR ME
5 changes: 3 additions & 2 deletions humans.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@

# TEAM

<name> -- <role> -- <twitter>
JuanMa [email protected] @juanma

# THANKS

<name>
Thanks to all
please leave a review 5/5

# TECHNOLOGY COLOPHON

Expand Down
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>Title for tagging</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
15 changes: 12 additions & 3 deletions simple.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<!DOCTYPE html>
<!-- Copyright 2024 Git.Training -->
<head>
<title></title>
<<<<<<< HEAD
<title>Compraing tags</title>
=======
<title>A Greate Website</title>
>>>>>>> realwork
<link rel="stylesheet" href="css/bootstrap.min.css">
<style>
body {
Expand All @@ -14,11 +19,15 @@
<main class="container">
<!-- Content Goes Here -->
<p>
Just some content
Just some content in there and there where we test what we have learned
</p>
</main>
<footer class="container">
<p>&copy; Company 2014</p>
<<<<<<< HEAD
<p>&copy; Juan Ma 2014</p>
=======
<p>&copy;Not a Git 2014</p>
>>>>>>> realwork
</footer>
</body>
</html>