Skip to content
Snippets Groups Projects
Commit e217a92f authored by BMosnier's avatar BMosnier
Browse files

Q2.10

parent 388ada2f
No related branches found
No related tags found
No related merge requests found
...@@ -283,11 +283,11 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge ...@@ -283,11 +283,11 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
$ git checkout master $ git checkout master
Switched to branch 'master' Switched to branch 'master'
0. Ajoutez et commitez un fichier (touch new_file) 0. Ajoutez et commitez un fichier (touch new_file)
> >
$ touch new_file $ touch new_file
$ git add new_file $ git add new_file
$ git commit -m "Q2.11" $ git commit -m "Q2.8"
[master 6e21998] Q2.11 [master 6e21998] Q2.8
1 file changed, 0 insertions(+), 0 deletions(-) 1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 new_file create mode 100644 new_file
...@@ -296,6 +296,26 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge ...@@ -296,6 +296,26 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
$ git checkout MosnierDrosne $ git checkout MosnierDrosne
Switched to branch 'MosnierDrosne' Switched to branch 'MosnierDrosne'
0. Affichez un historique sous forme de graph (`a dog`) de votre repo `*` 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 ##### 3. Merge
0. Merge depuis head 0. Merge depuis head
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment