The document discusses the basics of Git version control system. It begins with an overview of key Git concepts like snapshots of the project files rather than file differences. It then demonstrates Git functionality through a simple example of adding, modifying and renaming files in a sample project. The example shows how Git records the changes through commits and is able to reconstruct previous versions of the files from snapshots. It also touches on concepts like branches and merges.
23. #include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
README.txt
hello.c
hola.c
5 Haziran 13 Çarşamba
24. #include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
README.txt
hello.c
hola.c
5 Haziran 13 Çarşamba
25. #include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
README.txt
hello.c
hola.c
5 Haziran 13 Çarşamba
26. #include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
README.txt
hello.c
hola.c
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
README.txt
hello.c
hola.c
5 Haziran 13 Çarşamba
27. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
README.txt
hello.c
hola.c
5 Haziran 13 Çarşamba
28. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
README.txt
hello.c
hola.c
5 Haziran 13 Çarşamba
29. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
README.txt
hello.c
hola.c
hola.c
5 Haziran 13 Çarşamba
30. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hola.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
Commit
C
README.txt
hello.c
hola.c (rename)
5 Haziran 13 Çarşamba
31. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hola.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
Commit
C
README.txt
hello.c
hola.c (rename)
5 Haziran 13 Çarşamba
32. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hola project.
Licensed under GPL.
README.txt hola.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
Commit
C
-Hello
+Hola
Commit
D
README.txt
hello.c
hola.c (rename)
(copy)
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
hello.c
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hola.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
Commit
C
README.txt
hello.c
hola.c (rename)
5 Haziran 13 Çarşamba
33. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hola project.
Licensed under GPL.
README.txt hola.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
Commit
C
-Hello
+Hola
Commit
D
README.txt
hello.c
hola.c (rename)
(copy)
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
hello.c
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hola.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
Commit
C
README.txt
hello.c
hola.c (rename)
5 Haziran 13 Çarşamba
34. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hola project.
Licensed under GPL.
README.txt hola.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
Commit
C
-Hello
+Hola
Commit
D
README.txt
hello.c
hola.c (rename)
(copy)
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
hello.c
5 Haziran 13 Çarşamba
36. #include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
5 Haziran 13 Çarşamba
37. #include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
CHECKSUM
5 Haziran 13 Çarşamba
38. #include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
CHECKSUM
5 Haziran 13 Çarşamba
39. #include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
5 Haziran 13 Çarşamba
40. #include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
5 Haziran 13 Çarşamba
41. #include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
5 Haziran 13 Çarşamba
42. #include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
5 Haziran 13 Çarşamba
43. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
5 Haziran 13 Çarşamba
44. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
5 Haziran 13 Çarşamba
45. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
5 Haziran 13 Çarşamba
46. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
5 Haziran 13 Çarşamba
47. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hello.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
5 Haziran 13 Çarşamba
48. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
5 Haziran 13 Çarşamba
49. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
5 Haziran 13 Çarşamba
50. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
5 Haziran 13 Çarşamba
51. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
5 Haziran 13 Çarşamba
52. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
5 Haziran 13 Çarşamba
53. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
5 Haziran 13 Çarşamba
54. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hello project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
5 Haziran 13 Çarşamba
55. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hola project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
This is Scott's
Hola project.
Licensed under
GPL.
84f
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
hello.c
5 Haziran 13 Çarşamba
56. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hola project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
This is Scott's
Hola project.
Licensed under
GPL.
84f
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
hello.c
5 Haziran 13 Çarşamba
57. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hola project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
This is Scott's
Hola project.
Licensed under
GPL.
84f
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
hello.c
5 Haziran 13 Çarşamba
58. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hola project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
This is Scott's
Hola project.
Licensed under
GPL.
84f
Commit
D
84f README.txt
6d4 hola.c
6d4 hello.c
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
hello.c
5 Haziran 13 Çarşamba
59. #include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
This is Scott's
Hola project.
Licensed under GPL.
README.txt hola.c
Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
This is Scott's
Hola project.
Licensed under
GPL.
84f
Commit
D
84f README.txt
6d4 hola.c
6d4 hello.c
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
hello.c
5 Haziran 13 Çarşamba
60. Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
Commit
C
-Hello
+Hola
Commit
D
README.txt
hello.c
hola.c (rename)
(copy)
5 Haziran 13 Çarşamba
61. Commit
A
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
c3d
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
f13
#include<stdio.h>
int main(void) {
printf("Holan");
return 0;
}
6d4
Commit
B
c3d README.txt
6d4 hello.c
Commit
C
c3d README.txt
6d4 hola.c
This is Scott's
Hola project.
Licensed under
GPL.
84f
Commit
D
84f README.txt
6d4 hola.c
6d4 hello.c
Commit
A
This is Scott's Hello
project.
Licensed under GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
- printf("Holan");
+ printf("Holan");
Commit
B
Commit
C
-Hello
+Hola
Commit
D
README.txt
hello.c
hola.c (rename)
(copy)
5 Haziran 13 Çarşamba
86. A Basic Workflow
Edit files
Stage the changes
Review your changes
Commit the changes
vim / emacs / etc
git add (file)
repo status
git commit
5 Haziran 13 Çarşamba
87. A Basic Workflow
Edit files
Stage the changes
Review your changes
Commit the changes
vim / emacs / etc
git add (file)
repo status
git commit
5 Haziran 13 Çarşamba
88. A Basic Workflow
Edit files
Stage the changes
Review your changes
Commit the changes
vim / emacs / etc
git add (file)
repo status
git commit
5 Haziran 13 Çarşamba
89. A Basic Workflow
Edit files
Stage the changes
Review your changes
Commit the changes
vim / emacs / etc
git add (file)
git status / git diff
git commit
5 Haziran 13 Çarşamba
90. A Basic Workflow
Edit files
Stage the changes
Review your changes
Commit the changes
vim / emacs / etc
git add (file)
git status / git diff
git commit
5 Haziran 13 Çarşamba
91. A Basicerer Workflow
Edit files
Stage and Commit
vim / emacs / etc
git commit -a
5 Haziran 13 Çarşamba
101. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b
commit size
ae668..
tree
parent
author
committer
my commit message goes here
and it is really, really cool
c4ec5
a149e
Scott
Scott
tree c4ec543b0322744e55c5efc9b6c4e449d398dbff
parent a149e2160b3f7573768cdc2fce24d0881f3577e1
author Scott Chacon <schacon@gmail.com> 1223402504 -0700
committer Scott Chacon <schacon@gmail.com> 1223402504 -0700
descriptive commit message
5 Haziran 13 Çarşamba
106. commit size
ae668..
tree
parent
author
committer
my commit message goes here
and it is really, really cool
c4ec5
a149e
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
commit size
tree
parent
author
committer
this is the previous commit
and I am very proud of it
2de54
38def
Scott
Scott
5 Haziran 13 Çarşamba
107. commit size
ae668..
tree
parent
author
committer
my commit message goes here
and it is really, really cool
c4ec5
a149e
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
commit size
tree
parent
author
committer
this is the previous commit
and I am very proud of it
2de54
38def
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
5 Haziran 13 Çarşamba
108. commit size
ae668..
tree
parent
author
committer
my commit message goes here
and it is really, really cool
c4ec5
a149e
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
commit size
tree
parent
author
committer
this is the previous commit
and I am very proud of it
2de54
38def
Scott
Scott
commit size
tree
parent
author
committer
this is the commit before that
and I'm not sure why
2fe65
90ecd
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
commit size
tree
parent
author
committer
this is the commit before that
and I'm not sure why
2fe65
90ecd
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
5 Haziran 13 Çarşamba
109. commit size
ae668..
tree
parent
author
committer
my commit message goes here
and it is really, really cool
c4ec5
a149e
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
commit size
tree
parent
author
committer
this is the previous commit
and I am very proud of it
2de54
38def
Scott
Scott
commit size
tree
parent
author
committer
this is the commit before that
and I'm not sure why
2fe65
90ecd
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
commit size
tree
parent
author
committer
this is the commit before that
and I'm not sure why
2fe65
90ecd
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
48e 77da1438d
c4e
3d5
1d3
03e
f46
23f
30e
67e
32a
5b1
5 Haziran 13 Çarşamba
110. commit size
ae668..
tree
parent
author
committer
my commit message goes here
and it is really, really cool
c4ec5
a149e
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
commit size
tree
parent
author
committer
this is the previous commit
and I am very proud of it
2de54
38def
Scott
Scott
commit size
tree
parent
author
committer
this is the commit before that
and I'm not sure why
2fe65
90ecd
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
commit size
tree
parent
author
committer
this is the commit before that
and I'm not sure why
2fe65
90ecd
Scott
Scott
app.yaml
index.yaml
main.py
./ c4e
03e
1d3
3d5
48e
77d
a14
38d
c4e
3d5
1d3
03e
f46
23f 30e
67e
32a
5b1
5 Haziran 13 Çarşamba
133. Commit
98ca9
master
HEAD
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
98ca9
i18n
master
HEAD
git branch i18n
5 Haziran 13 Çarşamba
134. Commit
98ca9
master
HEAD
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
98ca9
i18n
master
HEAD
git branch i18n
5 Haziran 13 Çarşamba
135. Commit
98ca9
master
HEAD
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
98ca9
i18n
master
HEAD
git branch
5 Haziran 13 Çarşamba
136. $ git branch
* master
i18n
Commit
98ca9
master
HEAD
c3d README.txt
f13 hello.c
This is Scott's
Hello project.
Licensed under
GPL.
#include<stdio.h>
int main(void) {
printf("Hellon");
return 0;
}
98ca9
i18n
master
HEAD
git branch
5 Haziran 13 Çarşamba
196. $ git merge iss53
Auto-merging index.html
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.
5 Haziran 13 Çarşamba
197. $ git merge iss53
Auto-merging index.html
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.
5 Haziran 13 Çarşamba
198. $ git merge iss53
Auto-merging index.html
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.
$ git status
index.html: needs merge
# 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)
#
#! unmerged: index.html
#
5 Haziran 13 Çarşamba
199. <<<<<<< HEAD:index.html
<div id="footer">contact :
email.support@github.com</div>
=======
<div id="footer">
please contact us at support@github.com
</div>
>>>>>>> iss53:index.html
5 Haziran 13 Çarşamba
201. $ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage
#
#!modified: index.html
#
5 Haziran 13 Çarşamba