Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
git-seminar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
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
Scientific Computing
education
git-seminar
Commits
25c5cc21
"src/git@gitlab.idiv.de:persefone/persefone-model.git" did not exist on "f6942e8b5bcf2d4f8b2d20ec61d791fb0a95e6d0"
Unverified
Commit
25c5cc21
authored
2 years ago
by
ck85nori
Browse files
Options
Downloads
Patches
Plain Diff
visualize git diff
parent
da984ec6
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
basics.html
+2
-9
2 additions, 9 deletions
basics.html
img/staging-area-diff.dot
+10
-0
10 additions, 0 deletions
img/staging-area-diff.dot
with
13 additions
and
9 deletions
.gitignore
+
1
−
0
View file @
25c5cc21
...
@@ -12,3 +12,4 @@ img/staging-area.svg
...
@@ -12,3 +12,4 @@ img/staging-area.svg
paper.html
paper.html
paper.pdf
paper.pdf
*.pdf
*.pdf
img/staging-area-diff.svg
This diff is collapsed.
Click to expand it.
basics.html
+
2
−
9
View file @
25c5cc21
...
@@ -584,18 +584,11 @@
...
@@ -584,18 +584,11 @@
`rm` and that does something entirely different
`rm` and that does something entirely different
</section>
</section>
<section
id=
"cli-git-diff
-1
"
data-markdown
>
<section
id=
"cli-git-diff"
data-markdown
>
## command line
## command line
### show changes
### show changes
```bash

# from staging area to current working copy
git diff
# show contents of staging area, i.e.
# from last commit to staging area
git diff --staged
```
notes:
notes:
- users should do this in a terminal with demo by us
- users should do this in a terminal with demo by us
...
...
This diff is collapsed.
Click to expand it.
img/staging-area-diff.dot
0 → 100644
+
10
−
0
View file @
25c5cc21
digraph
{
node
[
shape
=
"box"
,
style
=
"filled,rounded"
]
workdir
[
label
=
"working directory\n(changes not staged for commit)"
,
color
=
lightskyblue
]
stage
[
label
=
"staging area\n(changes to be committed)"
,
color
=
orchid
]
repo
[
label
=
"repository\n(tracked content)"
,
color
=
limegreen
]
workdir
->
stage
[
label
=
"git diff"
]
stage
->
repo
[
label
=
"git diff --staged"
]
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment