Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Gregory Mounie
formation-git
Commits
f6794390
Commit
f6794390
authored
Nov 06, 2017
by
Sylvain Bouveret
Browse files
Small style fixes in understanding-git
parent
4d04c97b
Changes
1
Hide whitespace changes
Inline
Side-by-side
FormaContinue_MeteoNov2017/Slides/understanding-git.tex
View file @
f6794390
...
...
@@ -69,7 +69,7 @@
\item
Beauty of Git:
\alert
{
very
}
simple data model
\\
(The tool is clever, the repository format is simple
\&
stupid)
\item
Understand the model, and the 150+ commands will become
\alert
{
simple
}
!
\alert
{
simple
}
!
\end{itemize}
\end{frame}
...
...
@@ -143,7 +143,7 @@
\footnotesize
\begin{semiverbatim}
$
git log
commit
\
textbf
{
7
a
7
fb
77
be
431
c
284
f
1
b
6
d
036
ab
9
aebf
646060271
}
commit
\
alert
{
7
a
7
fb
77
be
431
c
284
f
1
b
6
d
036
ab
9
aebf
646060271
}
Author: Matthieu Moy <Matthieu.Moy@imag.fr>
Date: Wed Jul
2
20
:
13
:
49
2014
+
0200
...
...
@@ -152,10 +152,8 @@ $ find .git/objects/
.git/objects/
.git/objects/fc
.git/objects/fc/264b697de62952c9ff763b54b5b11930c9cfec
.git/objects/a4
.git/objects/a4/7665ad8a70065b68fbcfb504d85e06551c3f4d
.git/objects/7a
.git/objects/
\
textbf
{
7a/7fb77be431c284f1b6d036ab9aebf646060271
}
.git/objects/
\
alert
{
7a/7fb77be431c284f1b6d036ab9aebf646060271
}
.git/objects/50
.git/objects/50/a345788a8df75e0f869103a8b49cecdf95a416
.git/objects/26
...
...
@@ -176,16 +174,12 @@ $ find .git/objects/
.git
/
objects
/
.git
/
objects
/
fc
.git
/
objects
/
fc
/
264
b
697
de
62952
c
9
ff
763
b
54
b
5
b
11930
c
9
cfec
.git
/
objects
/
a
4
.git
/
objects
/
a
4
/
7665
ad
8
a
70065
b
68
fbcfb
504
d
85
e
06551
c
3
f
4
d
.git
/
objects
/
59
.git
/
objects
/
59
/
802
e
9
b
115
bc
606
b
88
df
4
e
2
a
83958423661
d
8
c
4
.git
/
objects
/
7
a
.git
/
objects
/
7
a
/
7
fb
77
be
431
c
284
f
1
b
6
d
036
ab
9
aebf
646060271
.git
/
objects
/
25
.git
/
objects
/
25
/
7
cc
5642
cb
1
a
054
f
08
cc
83
f
2
d
943
e
56
fd
3
ebe
99
.git
/
objects
/
54
.git
/
objects
/
\
textbf
{
54
/
54
e
3
b
}
51
e
81
d
8
d
9
b
7
e
807
f
1
fc
21
e
618880
c
1
ac
9
.git
/
objects
/
\
alert
{
54
/
54
e
3
b
}
51
e
81
d
8
d
9
b
7
e
807
f
1
fc
21
e
618880
c
1
ac
9
...
\end
{
semiverbatim
}
%$
...
...
@@ -215,7 +209,7 @@ $ find .git/objects/
\begin
{
frame
}
[
fragile
]
\frametitle
{
On
-
disk format: Pack files
}
\
small
\
footnotesize
\begin
{
semiverbatim
}
$
du -sh .git/objects/
68K .git/objects/
...
...
@@ -231,7 +225,8 @@ $ find .git/objects/
.git
/
objects
/
info
.git
/
objects
/
info
/
packs
$
\end{semiverbatim}
\end{semiverbatim}
\vspace
{
-0.5cm
}
\begin{center}
\large
$
\leadsto
$
More efficient format, no conceptual change
\\
...
...
@@ -245,6 +240,7 @@ $
\begin{itemize}
\item
\texttt
{
\bfseries
{}
git cat-file -p
}
: pretty-print the content of an object
\end{itemize}
\vfill
\footnotesize
\begin{semiverbatim}
$
git log
-
{}
-
oneline
...
...
@@ -257,6 +253,17 @@ author Matthieu Moy <Matthieu.Moy@imag.fr> 1404388746 +0200
committer Matthieu Moy <Matthieu.Moy@imag.fr> 1404388746 +0200
add README.txt
\end{semiverbatim}
\end{frame}
\begin{frame}
[fragile]
\frametitle
{
Exploring the object database
}
\begin{itemize}
\item
\texttt
{
\bfseries
{}
git cat-file -p
}
: pretty-print the content of an object
\end{itemize}
\vfill
\footnotesize
\begin{semiverbatim}
$
git cat
-
file
-
p
{
\color
{
green
!
50
!
black
}
\bfseries
{}
59802
e
9
b
115
bc
606
b
88
df
4
e
2
a
83958423661
d
8
c
4
}
100644
blob
{
\color
{
violet
!
50
!
black
}
\bfseries
{}
257
cc
5642
cb
1
a
054
f
08
cc
83
f
2
d
943
e
56
fd
3
ebe
99
}
README.txt
040000
tree
2627
a
0555
f
9
b
58632
be
848
fee
8
a
4602
a
1
d
61
a
05
f sandbox
...
...
@@ -292,7 +299,7 @@ Merge made by the 'recursive' strategy.
\begin
{
frame
}
[
fragile
]
\frametitle
{
Merge commits in the object
database
}
\
footnote
size
\
script
size
\begin
{
semiverbatim
}
$
git checkout -b branch HEAD
^
$
echo foo > file.txt; git add file.txt
...
...
@@ -340,8 +347,8 @@ String s; // Reference named s
s
=
new String
(
"foo"
)
;
//
Object pointed to by s
String s
2
=
s;
//
Two refs for the same object
\end
{
lstlisting
}
\item
In Git: likewise
!
\
small
\item
In Git: likewise
!
\
footnotesize
\begin
{
semiverbatim
}
$
git log --oneline
{
\color
{
blue!50!black
}
\bfseries
{}
5454e3b
}
add README.txt
...
...
@@ -516,28 +523,28 @@ $ git rev-parse refs/heads/master
\end{itemize}
\end{frame}
\section
{
Exercises
}
%
\section{Exercises}
\begin{frame}
[fragile]
\frametitle
{
Exercises
}
%
\begin{frame}[fragile]
%
\frametitle{Exercises}
\begin{itemize}
\item
Visit
\url
{
https://github.com/moy/dumb-project.git
}
\item
Fork it from the web interface (or just
\texttt
{
git clone
}
)
\item
Clone it on your machine
\item
Repair the dirty history!
\end{itemize}
\end{frame}
%
\begin{itemize}
%
\item Visit \url{https://github.com/moy/dumb-project.git}
%
\item Fork it from the web interface (or just \texttt{git clone})
%
\item Clone it on your machine
%
\item Repair the dirty history!
%
\end{itemize}
%
\end{frame}
\begin{frame}
[fragile]
\frametitle
{
If you liked this training ...
}
\begin{center}
\Large
``Principes et utilisations de l'outil Git'', 1 day
training. Next iteration: April 25th 2016. Tell your friends ;-).
%
\begin{frame}[fragile]
%
\frametitle{If you liked this training ...}
%
\begin{center}
%
\Large ``Principes et utilisations de l'outil Git'', 1 day
%
training. Next iteration: April 25th 2016. Tell your friends ;-).
{
\tiny
\url
{
http://formation-continue.grenoble-inp.fr/genie-logiciel-programmation/principes-et-utilisations-de-l-outil-git-681441.kjsp#page-presentation
}}
\end{center}
\end{frame}
%
{\tiny \url{http://formation-continue.grenoble-inp.fr/genie-logiciel-programmation/principes-et-utilisations-de-l-outil-git-681441.kjsp#page-presentation}}
%
\end{center}
%
\end{frame}
\end{document}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment