branch: externals/eev
commit b3eff2894333b8ea246c40b26e63e109a5ea1221
Author: Eduardo Ochs <eduardoo...@gmail.com>
Commit: Eduardo Ochs <eduardoo...@gmail.com>
Small changes in `(find-git-intro)'
---
VERSION | 4 ++--
eev-intro.el | 31 +++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/VERSION b/VERSION
index 7a09630..bc98dc0 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Tue Oct 13 08:14:43 GMT 2020
-Tue Oct 13 05:14:43 -03 2020
+Tue Oct 13 16:07:41 GMT 2020
+Tue Oct 13 13:07:41 -03 2020
diff --git a/eev-intro.el b/eev-intro.el
index 08225fe..d88a205 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -11302,13 +11302,44 @@ because when it was created it pointed to the commit
with message
\\ /
A
+NEXT STEPS: explain how to use git merge both from the command
+line and from magit; explain HEAD, master, and tags. Point to man
+pages in man and text format and to sections in Scott Chacon's
+book. I NEED LOTS OF HELP HERE.
+
(find-man \"git-merge\")
+ (find-gitinternalspage)
+ (find-gitinternalstext)
+
+
+3. A second repository
+======================
+HELP PLEEEASEEEE
+
+
+ (eepitch-shell)
+ (eepitch-kill)
+ (eepitch-shell)
+ rm -Rfv /tmp/git-test/repo2/
+ mkdir /tmp/git-test/repo2/
+ cd /tmp/git-test/repo2/
+ . /tmp/git-test/git-defs
+ # (find-fline \"/tmp/git-test/git-defs\")
+ git clone /tmp/git-test/repo1/ .
+ ls -lAF
+ # (find-gitk \"/tmp/git-test/repo2/\")
+ # (find-fline \"/tmp/git-test/repo2/\")
+ # (find-fline \"/tmp/git-test/repo2/.git/\")
+ # (find-fline \"/tmp/git-test/repo2/.git/config\")
+ # (find-man \"1 git-remote\")
+ # (find-progitpage (+ 24 36) \"Adding Remote Repositories\")
+ # (find-progittext (+ 24 36) \"Adding Remote Repositories\")
" pos-spec-list)))
