From 19f61d98effc69dde4729b834ad9f2696e472cc6 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Wed, 23 May 2012 10:38:31 -0700 Subject: kron --- figures/git-pull-3.svg | 877 ++++++++++++++++++++++++++++++++++++ git-workshop/figures/git-pull-3.svg | 877 ------------------------------------ 2 files changed, 877 insertions(+), 877 deletions(-) create mode 100644 figures/git-pull-3.svg delete mode 100644 git-workshop/figures/git-pull-3.svg diff --git a/figures/git-pull-3.svg b/figures/git-pull-3.svg new file mode 100644 index 0000000..536e801 --- /dev/null +++ b/figures/git-pull-3.svg @@ -0,0 +1,877 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Commit A + + + + Commit A + + + + Commit C + + + + Commit D + + + + + + Commit B + + + + + + git push + + + git pull + + + + + + Commit B + + + + Commit D + + + + Commit E + + + git push + + + + Commit E + + + + + + + diff --git a/git-workshop/figures/git-pull-3.svg b/git-workshop/figures/git-pull-3.svg deleted file mode 100644 index 536e801..0000000 --- a/git-workshop/figures/git-pull-3.svg +++ /dev/null @@ -1,877 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - Commit A - - - - Commit A - - - - Commit C - - - - Commit D - - - - - - Commit B - - - - - - git push - - - git pull - - - - - - Commit B - - - - Commit D - - - - Commit E - - - git push - - - - Commit E - - - - - - - -- cgit v1.2.3-70-g09d2