From 5585bb85fdc7ca5f23ad2e2928ee95ca07c59314 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Wed, 23 May 2012 10:38:11 -0700 Subject: importing new location --- figures/git-pull-2.svg | 630 ++++++++++++++++++++++++++++++++++++ figures/git-pull.svg | 587 +++++++++++++++++++++++++++++++++ figures/git-push.svg | 588 +++++++++++++++++++++++++++++++++ figures/schema.svg | 587 +++++++++++++++++++++++++++++++++ git-workshop/figures/git-pull-2.svg | 630 ------------------------------------ git-workshop/figures/git-pull.svg | 587 --------------------------------- git-workshop/figures/git-push.svg | 588 --------------------------------- git-workshop/figures/schema.svg | 587 --------------------------------- git-workshop/workshop.tex | 28 -- readme.txt | 3 - workshop.tex | 28 ++ 11 files changed, 2420 insertions(+), 2423 deletions(-) create mode 100644 figures/git-pull-2.svg create mode 100644 figures/git-pull.svg create mode 100644 figures/git-push.svg create mode 100644 figures/schema.svg delete mode 100644 git-workshop/figures/git-pull-2.svg delete mode 100644 git-workshop/figures/git-pull.svg delete mode 100644 git-workshop/figures/git-push.svg delete mode 100644 git-workshop/figures/schema.svg delete mode 100644 git-workshop/workshop.tex delete mode 100644 readme.txt create mode 100644 workshop.tex diff --git a/figures/git-pull-2.svg b/figures/git-pull-2.svg new file mode 100644 index 0000000..9384fbb --- /dev/null +++ b/figures/git-pull-2.svg @@ -0,0 +1,630 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Commit A + + + + Commit A + + + + Commit C + + + + Commit C + + + + + + Commit B + + + + Commit C + + + git push + + + git pull + + + + diff --git a/figures/git-pull.svg b/figures/git-pull.svg new file mode 100644 index 0000000..0c43d71 --- /dev/null +++ b/figures/git-pull.svg @@ -0,0 +1,587 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Commit A + + + + Commit A + + + + Commit B + + + + Commit C + + + + + + Commit B + + + + Commit C + + + git pull + + + diff --git a/figures/git-push.svg b/figures/git-push.svg new file mode 100644 index 0000000..01e2b86 --- /dev/null +++ b/figures/git-push.svg @@ -0,0 +1,588 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Commit A + + + + Commit A + + + + Commit B + + + + Commit C + + + + + + Commit B + + + + Commit C + + + git push + + + diff --git a/figures/schema.svg b/figures/schema.svg new file mode 100644 index 0000000..8b1f340 --- /dev/null +++ b/figures/schema.svg @@ -0,0 +1,587 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + Commit A + + + + Commit A + + + + Commit B + + + + Commit C + + + + + + Commit B + + + + Commit C + + + git push + + + diff --git a/git-workshop/figures/git-pull-2.svg b/git-workshop/figures/git-pull-2.svg deleted file mode 100644 index 9384fbb..0000000 --- a/git-workshop/figures/git-pull-2.svg +++ /dev/null @@ -1,630 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - Commit A - - - - Commit A - - - - Commit C - - - - Commit C - - - - - - Commit B - - - - Commit C - - - git push - - - git pull - - - - diff --git a/git-workshop/figures/git-pull.svg b/git-workshop/figures/git-pull.svg deleted file mode 100644 index 0c43d71..0000000 --- a/git-workshop/figures/git-pull.svg +++ /dev/null @@ -1,587 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - Commit A - - - - Commit A - - - - Commit B - - - - Commit C - - - - - - Commit B - - - - Commit C - - - git pull - - - diff --git a/git-workshop/figures/git-push.svg b/git-workshop/figures/git-push.svg deleted file mode 100644 index 01e2b86..0000000 --- a/git-workshop/figures/git-push.svg +++ /dev/null @@ -1,588 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - Commit A - - - - Commit A - - - - Commit B - - - - Commit C - - - - - - Commit B - - - - Commit C - - - git push - - - diff --git a/git-workshop/figures/schema.svg b/git-workshop/figures/schema.svg deleted file mode 100644 index 8b1f340..0000000 --- a/git-workshop/figures/schema.svg +++ /dev/null @@ -1,587 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - Commit A - - - - Commit A - - - - Commit B - - - - Commit C - - - - - - Commit B - - - - Commit C - - - git push - - - diff --git a/git-workshop/workshop.tex b/git-workshop/workshop.tex deleted file mode 100644 index b9cdc93..0000000 --- a/git-workshop/workshop.tex +++ /dev/null @@ -1,28 +0,0 @@ -\documentclass[14pt]{beamer} -\usepackage[utf8x]{inputenc} -\usepackage[T1]{fontenc} -\usepackage{hyperref} -\usepackage{algorithmic} -\usepackage{algorithm} -\usepackage{graphicx} - -\usepackage{helvet} -%\setbeamercovered{transparent} -\usecolortheme{crane} - -\author[SC \& HT]{Stéphane Caron \and Thibaut Horel} -\institute{Technicolor Palo Alto} -\date{\today} -\title{Git Workshop} - -\begin{document} - -\begin{frame} -\titlepage -\end{frame} - -\begin{frame} -... -\end{frame} - -\end{document} diff --git a/readme.txt b/readme.txt deleted file mode 100644 index 3483714..0000000 --- a/readme.txt +++ /dev/null @@ -1,3 +0,0 @@ -This repository is a test of the git protocol. It is accessible by interns (and Umar); it is readable by everybody. - -Can I write here? (—S) diff --git a/workshop.tex b/workshop.tex new file mode 100644 index 0000000..b9cdc93 --- /dev/null +++ b/workshop.tex @@ -0,0 +1,28 @@ +\documentclass[14pt]{beamer} +\usepackage[utf8x]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{hyperref} +\usepackage{algorithmic} +\usepackage{algorithm} +\usepackage{graphicx} + +\usepackage{helvet} +%\setbeamercovered{transparent} +\usecolortheme{crane} + +\author[SC \& HT]{Stéphane Caron \and Thibaut Horel} +\institute{Technicolor Palo Alto} +\date{\today} +\title{Git Workshop} + +\begin{document} + +\begin{frame} +\titlepage +\end{frame} + +\begin{frame} +... +\end{frame} + +\end{document} -- cgit v1.2.3-70-g09d2