From 3e994b6100629ab967065ae086cc2ec3efc81b7c Mon Sep 17 00:00:00 2001 From: Arnaud Legrand Date: Wed, 27 Mar 2019 13:01:41 +0100 Subject: [PATCH] Move the introduction to magit by Marie-Gabrielle to our own documention --- module2/ressources/emacs_orgmode.org | 31 +++++++++++++++--- .../ressources/emacs_orgmode_images/git1.png | Bin 0 -> 13199 bytes 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100755 module2/ressources/emacs_orgmode_images/git1.png diff --git a/module2/ressources/emacs_orgmode.org b/module2/ressources/emacs_orgmode.org index 75676e4..e958406 100644 --- a/module2/ressources/emacs_orgmode.org +++ b/module2/ressources/emacs_orgmode.org @@ -352,12 +352,35 @@ in the context of this MOOC in a [[https://www.fun-mooc.fr/courses/course-v1:inr It is very powerful and we use it on a daily basis but you should definitely understand what git does behind the scenes beforehand. If you feel this would be useful for you, you should follow [[https://magit.vc/screenshots/][this visual -walk-through]] or [[https://www.emacswiki.org/emacs/Magit][this really short "crash course"]]. If you installed the -previous "/reproducible research/" emacs configuration, you can easily -invoke magit by using ~C-x g~. +walk-through]] or [[https://www.emacswiki.org/emacs/Magit][this really short "crash course"]]. + +If you installed the previous "/reproducible research/" emacs +configuration, you can easily invoke magit by using ~C-x g~. Magit will +then prompt you for the path of your local clone of the git repository +(the path to mooc-rr in the context of this MOOC). +[[file:emacs_orgmode_images/git1.png]] + +If you do not rely on our "/reproducible research/" emacs configuration, +you should have a look at [[https://magit.vc/manual/magit/Installing-from-an-Elpa-Archive.html][how to install magit from an ELPA archive]]. + +The following method has been tested with Windows and worked like a charm: +- Add the following piece of text in your =.emacs.d/init.el= file: + #+begin_src emacs-lisp + (require 'package) + (add-to-list 'package-archives + '("melpa" . "http://melpa.org/packages/") t) + + #+end_src +- Launch Emacs and run the following commands: + #+BEGIN_EXAMPLE + M-x package-refresh-contents RET + M-x package-install RET magit RET + #+END_EXAMPLE + NB: =M-= corresponds to the == key and =RET= corresponds to the + == key. ** Other resources - [[https://orgmode.org/orgguide.pdf][The compact Org-mode Guide]] -- A huge ressource of emacs/org-mode magic is Bernt Hansen's «[[http://doc.norang.ca/org-mode.html][Organize +- A huge resource of emacs/org-mode magic is Bernt Hansen's «[[http://doc.norang.ca/org-mode.html][Organize your life in plain text]]», whose source is obviously itself an [[http://doc.norang.ca/org-mode.org][org-mode document]]. - [[https://github.com/dfeich/org-babel-examples][Many examples illustrating the use of different languages in diff --git a/module2/ressources/emacs_orgmode_images/git1.png b/module2/ressources/emacs_orgmode_images/git1.png new file mode 100755 index 0000000000000000000000000000000000000000..f6721fdac3580626d220049e5c1606403b49fa4f GIT binary patch literal 13199 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 HS%v%`>7$Yx literal 0 HcmV?d00001 -- 2.18.1