From e217a92f7ef33e4c6c357b38c05937218e5e0628 Mon Sep 17 00:00:00 2001
From: BMosnier <bastienmosnier@gmail.com>
Date: Tue, 30 Jan 2018 00:02:01 +0100
Subject: [PATCH] Q2.10
---
MosnierDrosneTp1.md | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/MosnierDrosneTp1.md b/MosnierDrosneTp1.md
index cd07c49..4421b5d 100644
--- a/MosnierDrosneTp1.md
+++ b/MosnierDrosneTp1.md
@@ -283,11 +283,11 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
$ git checkout master
Switched to branch 'master'
0. Ajoutez et commitez un fichier (touch new_file)
- >
+ >
$ touch new_file
$ git add new_file
- $ git commit -m "Q2.11"
- [master 6e21998] Q2.11
+ $ git commit -m "Q2.8"
+ [master 6e21998] Q2.8
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 new_file
@@ -296,6 +296,26 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
$ git checkout MosnierDrosne
Switched to branch 'MosnierDrosne'
0. Affichez un historique sous forme de graph (`a dog`) de votre repo `*`
+ >
+ $ git log --graph --topo-order --all --pretty=format:'%s %d'
+ * Q2.9 (HEAD -> MosnierDrosne)
+ * Q2.7
+ * Q2.5
+ | * Q2.8 (master)
+ | | * Q2.3.2 (MosnierDrosne-2.4)
+ | | * Q2.3.1
+ | |/
+ |/|
+ * | Q2.2
+ * | Q2.1
+ |/
+ * Q1.14
+ * Q1.12
+ * Q1.9
+ * Q1.8
+ * Q1.6
+ * Q1.2
+
##### 3. Merge
0. Merge depuis head
--
GitLab