From 03c30178f12a0526308e17df6ac9254c3008567e Mon Sep 17 00:00:00 2001 From: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma> Date: Mon, 12 Feb 2018 22:19:47 +0100 Subject: [PATCH] Q2.2 --- .gitignore | 1 + REDA_YOUSSEF.md | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..92b7d53 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +file2ignore diff --git a/REDA_YOUSSEF.md b/REDA_YOUSSEF.md index fb4f61e..145b2a9 100644 --- a/REDA_YOUSSEF.md +++ b/REDA_YOUSSEF.md @@ -319,21 +319,47 @@ index 26d82fc..50663bf 100644 git diff ``` ``` -git add . +$ git add * +The following paths are ignored by one of your .gitignore files: +file2ignore +Use -f if you really want to add them. ``` + > On commite cette étape Q1.15 ``` -git commit -m "Q1.15" +$ git commit -m "Q1.15" +[master 717b390] Q1.15 + 1 file changed, 168 insertions(+), 5 deletions(-) ``` ##### 2. Les branches 0. Créez une branche portant votre nom et basculer sur cette branche (dans la suite du TP cette branche est désignée par `mybranch`) ``` -git branch reda_youssef +$ git branch reda_youssef +$ git checkout reda_youssef +Switched to branch 'reda_youssef' +M REDA_YOUSSEF.md ``` + 0. Lister les branches locales et les fichiers présent dans le répertoire courant `*` ``` -git branch +$ git branch + master +* reda_youssef +``` +``` +$ git ls-files +REDA_YOUSSEF.md +start +``` +``` +$ git add . +warning: LF will be replaced by CRLF in .gitignore. +The file will have its original line endings in your working directory. +``` + > +``` ``` + 0. Aficher le status de votre repo `*` ``` git status -- GitLab