Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Git course
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
courses
Git course
Merge requests
!6
Some typo and formatting fixes in tips lecture
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Some typo and formatting fixes in tips lecture
tips_fixes
into
master
Overview
0
Commits
1
Changes
Merged
Martijn Vermaat
requested to merge
tips_fixes
into
master
10 years ago
Overview
0
Commits
1
Changes
-
Expand
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
8d9910cf
1 commit,
10 years ago
+
12
−
9
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
tips/tips.tex
+
12
−
9
Options
@@ -86,7 +86,7 @@
\bigskip
\pause
Then, in you ``\bt{.bashrc}'' file, add ``\bt{\_\_git\_ps1}'' to the
Then, in you
r
``\bt{.bashrc}'' file, add ``\bt{\_\_git\_ps1}'' to the
``\bt{PS1}'' variable, and source your ``\bt{.bashrc}'' again.
\bigskip
\end{frame}
@@ -101,7 +101,7 @@
\pause
You can view who committed the line change, the commit hash,
and the commit time using ``\bt{git blame}''
and the commit time using ``\bt{git blame}''
.
\begin{lstlisting}[language=none, caption=git blame command]
$ git blame README
a4394d28 (bow 2014-06 ...) Second version.
@@ -119,7 +119,7 @@
\bigskip
\pause
Official releases, for example, are better referred as v1.0
Official releases, for example, are better referred
to
as v1.0
than a76a0fx.
\bigskip
\pause
@@ -210,7 +210,7 @@
\bigskip
\pause
This can be done via ``\bt{git diff -w}''
This can be done via ``\bt{git diff -w}''
.
\begin{lstlisting}[language=none, caption=git diff without whitespace]
$ git diff -w
\end{lstlisting}
@@ -259,7 +259,7 @@
You can also use the command to meld current staged changes to your last
committed change.
\begin{lstlisting}[language=none, caption=git
blame comma
nd]
\begin{lstlisting}[language=none, caption=git
commit --ame
nd]
$ git status
Changes to be committed:
modified: README
@@ -310,8 +310,10 @@
\begin{frame}[fragile]
\frametitle{Viewing}
In Linux, git uses the ``\bt{~/.gitconfig}'' file as its main
configuration file.
% http://tex.stackexchange.com/a/9372
In Linux, git uses the
``\bt{{\raise.17ex\hbox{$\scriptstyle\mathtt{\sim}$}}/.gitconfig}'' file as
its main configuration file.
\bigskip
\pause
@@ -330,8 +332,9 @@
\begin{frame}[fragile]
\frametitle{Modifying}
To edit the file directly, open ``\bt{~/.gitconfig}'' in a text editor
and save your changes.
To edit the file directly, open
``\bt{{\raise.17ex\hbox{$\scriptstyle\mathtt{\sim}$}}/.gitconfig}'' in a
text editor and save your changes.
\begin{lstlisting}[language=none, caption=Modifying the config file]
$ vim ~/.gitconfig
\end{lstlisting}
Loading