Skip to content
Snippets Groups Projects
Commit 665723e6 authored by Clement  SERRE's avatar Clement SERRE
Browse files

Q2.12

parent 51905a3c
No related branches found
No related tags found
No related merge requests found
...@@ -197,8 +197,34 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge ...@@ -197,8 +197,34 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
* 7b7f60f Q1.2 * 7b7f60f Q1.2
``` ```
0. Revenir sur la branche master 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) 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 `*` 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 `*` 0. Affichez un historique sous forme de graph (`a dog`) de votre repo `*`
##### 3. Merge ##### 3. Merge
......
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