Skip to content

Commit

Permalink
add git summary in Latex
Browse files Browse the repository at this point in the history
  • Loading branch information
lougranou committed Feb 25, 2019
1 parent fca2153 commit f695574
Show file tree
Hide file tree
Showing 12 changed files with 347 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Exercice/test_maven/.idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Exercice/test_maven/.idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Exercice/test_maven/.idea/test_maven.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Exercice/test_maven/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

137 changes: 137 additions & 0 deletions Exercice/test_maven/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 81 additions & 0 deletions Exercice/test_maven/my-app/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1.0-SNAPSHOT</version>

<name>my-app</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.6</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
<plugins>
<!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.mycompany.app;

/**
* Hello world!
*
*/
public class App
{
public static void main( String[] args )
{
System.out.println( "Hello World!" );
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.mycompany.app;

import static org.junit.Assert.assertTrue;

import org.junit.Test;

/**
* Unit test for simple App.
*/
public class AppTest
{
/**
* Rigorous Test :-)
*/
@Test
public void shouldAnswerWithTrue()
{
assertTrue( true );
}
}
41 changes: 41 additions & 0 deletions Laboratoire/Commande GIT/commande_git.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
\documentclass{report}

\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage[francais]{babel}
\title{Commandes git usuelles}
\author{Legrand Bruno}
\date{An de grâce 2019}

\begin{document}
\maketitle

\part{Workflow git}
\chapter{Préparation d'une nouvelle branche}
\section{Revenir à la branche master}
git checkout master

\section{faire retourner un fichier dans l'état du dernier commit}
git fetch upstream

\section{Appliquer les modifications de upstream à sa branche}
git pull upstream master

\section{Créer \& Changer de branche}
git checkout -b \og NOM\_DE\_LA\_BRANCHE \fg


\chapter{Code finalisé}
\paragraph{Une fois que le code a été testé et est près nous pouvons le push sur origin}

\section{ajouter le code au prochain commit}
git add \og . /src monfichier \fg

\section{Envoyer le commit avec un message}
git commit -m "MON\_MESSAGE"

\section{push le commit de la branch sur le repo origin github}
git push origin <NOM\_DE\_LA\_BRANCHE>


\end{document}
27 changes: 27 additions & 0 deletions Laboratoire/Commande GIT/git.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
### GIT - command

- renevir à la branch master :
git checkout master

- faire retourner un fichier dans l'état du dernier commit (annuler une modification d'un fichier :
git checkout /CHEMIN/monFichier.xml

- Récupérer les commits qui sont sur le upstream
git fetch upstream

- appliquer les modifications à sa branch
git pull upstream master

- Créer & Changer de branche
git checkout -b <NOM_DE_LA_NOUVELLE_BRANCHE>

Une fois le code terminer et que les tests passent !

- ajouter le code au prochain commit
git add <. /src monFichier ...>

- envoyer le commit avec un message
git commit -m "Mon message"

- push le commit de la branch sur le repo origin github
git push origin <NOM_DE_LA_BRANCHE>
1 change: 1 addition & 0 deletions Laboratoire/Teaching-HEIGVD-RES-2019-Chill
Submodule Teaching-HEIGVD-RES-2019-Chill added at bf116d
Binary file added README.pdf
Binary file not shown.

0 comments on commit f695574

Please sign in to comment.