From 665723e63b70f342718fd00356a9d812da9fc752 Mon Sep 17 00:00:00 2001
From: SERRE Clement <clement.serre@poste.isima.fr>
Date: Mon, 8 Jan 2018 19:02:26 +0100
Subject: [PATCH] Q2.12
---
cdpw_tp1_SERRE_PRUNIER.md | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/cdpw_tp1_SERRE_PRUNIER.md b/cdpw_tp1_SERRE_PRUNIER.md
index 6f0c5ab..0ad48e7 100644
--- a/cdpw_tp1_SERRE_PRUNIER.md
+++ b/cdpw_tp1_SERRE_PRUNIER.md
@@ -197,8 +197,34 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
* 7b7f60f Q1.2
```
0. Revenir sur la branche master
+ ```git
+ clserre1@A210PC12:/h/Documents/cdpw $ git checkout master
+ Switched to branch 'master'
+ ```
0. Ajoutez et commitez un fichier (touch new_file)
+ ```git
+ clserre1@A210PC12:/h/Documents/cdpw $ touch un_fichier
+ clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"Q2.10"
+ On branch master
+ Untracked files:
+ un_fichier
+
+ nothing added to commit but untracked files present
+ clserre1@A210PC12:/h/Documents/cdpw $ git add .
+ clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"Q2.10" --amend
+ [master 9586626] Q2.10
+ Date: Mon Jan 8 18:45:54 2018 +0100
+ 2 files changed, 28 insertions(+)
+ create mode 100644 un_fichier
+ ```
0. Revenir sur votre branche `mybranch` pour completer le compte rendu `*`
+ ```git
+ clserre1@A210PC12:/h/Documents/cdpw $ git checkout SERRE_PRUNIER
+ Switched to branch 'SERRE_PRUNIER'
+ clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"Q2.12"
+ [SERRE_PRUNIER 6f0f3c7] Q2.12
+ 1 file changed, 23 insertions(+)
+ ```
0. Affichez un historique sous forme de graph (`a dog`) de votre repo `*`
##### 3. Merge
--
GitLab