Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
2017-F2-Forge
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
Youssef NIDABRAHIM
2017-F2-Forge
Commits
984b0f55
Commit
984b0f55
authored
7 years ago
by
Clement SERRE
Browse files
Options
Downloads
Plain Diff
Merge branch 'SERRE_PRUNIER-3.3' into SERRE_PRUNIER
parents
313b711c
939141b2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cdpw_tp1_SERRE_PRUNIER.md
+51
-3
51 additions, 3 deletions
cdpw_tp1_SERRE_PRUNIER.md
with
51 additions
and
3 deletions
cdpw_tp1_SERRE_PRUNIER.md
+
51
−
3
View file @
984b0f55
...
...
@@ -164,10 +164,58 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
1 file changed, 19 insertions(+)
```
0. Aficher le status de votre repo `*`
```
git
clserre1@A210PC12:/h/Documents/cdpw $ git status
On branch SERRE_PRUNIER
Changes not staged for commit:
(use "git add
<file>
..." to update what will be committed)
(use "git checkout --
<file>
..." to discard changes in working directory)
modified: cdpw_tp1_SERRE_PRUNIER.md
no changes added to commit (use "git add" and/or "git commit -a")
clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"Q2.2"
[SERRE_PRUNIER a4e6b94] Q2.2
1 file changed, 10 insertions(+)
```
0. Créez une branche pour _développer_ la réponse de ce point (nommez là `mybranch-2.4` par exemple)
0. Afficher un historique sous forme de graph (`a dog`) de votre repo
0. Pourquoi les 2 branches pointent elles sur la même révision ?`*`
0. Afficher à nouvea l'historique pour montrer les modifications suite au précédent commit `*`
```
git
clserre1@A210PC12:/h/Documents/cdpw $ git checkout -b "SERRE_PRUNIER-2.3"
Switched to a new branch 'SERRE_PRUNIER-2.3'
M cdpw_tp1_SERRE_PRUNIER.md
```
1. Afficher un historique sous forme de graph (`a dog`) de votre repo
```
git
clserre1@A210PC12:/h/Documents/cdpw $ git log --all --decorate --oneline --graph
*
a4e6b94 (HEAD -> SERRE_PRUNIER-2.3, SERRE_PRUNIER) Q2.2
*
bd03bc0 Q2.1
*
ef6b3f6 (master) Q1.14
*
9573e3c Q1.12
*
3bd908e Q1.9
*
b28292b Q1.8
*
dd449ba Q1.6
*
7b7f60f Q1.2
```
2. Pourquoi les 2 branches pointent elles sur la même révision ?`*`
Les deux branches sont au même niveau de `commit`.
```
git
clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"Q2.3.II"
[SERRE_PRUNIER-2.3 4695520] Q2.3.II
1 file changed, 33 insertions(+), 3 deletions(-)
```
3. Afficher à nouveau l'historique pour montrer les modifications suite au précédent commit `*`
```
git
clserre1@A210PC12:/h/Documents/cdpw $ git log --all --decorate --oneline --graph
*
4695520 (HEAD -> SERRE_PRUNIER-2.3) Q2.3.II
*
a4e6b94 (SERRE_PRUNIER) Q2.2
*
bd03bc0 Q2.1
*
ef6b3f6 (master) Q1.14
*
9573e3c Q1.12
*
3bd908e Q1.9
*
b28292b Q1.8
*
dd449ba Q1.6
*
7b7f60f Q1.2
clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"Q2.3.III" [SERRE_PRUNIER-2.3 07fe6ef] Q2.3.III
1 file changed, 5 insertions(+)
```
0. Revenir la brache `mybranch`
```
git
clserre1@A210PC12:/h/Documents/cdpw $ git checkout SERRE_PRUNIER
...
...
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