web commit by http://natalian.org/

[git.ikiwiki.info.git] / doc / rcs / gitmanual.mdwn

diff --git a/doc/rcs/gitmanual.mdwn b/doc/rcs/gitmanual.mdwn
index 8fe9bc3ee7a825f6172dc35ef6c4f5349f0c4454..b40ac00346affd3f829b6715457c5de9bf75d202 100644 (file)
--- a/doc/rcs/gitmanual.mdwn
+++ b/doc/rcs/gitmanual.mdwn
@@ -1,16 +1,24 @@
-# on webconverger.org hosted on si.dabase.com (hendry)
+Main use case I am trying to accomplish: Edit wiki pages offline.
 
-Wiki page created with [ikiwiki](http://ikiwiki.info). Example usb.mdwn [[usb]]
+1. Imagine you're the administrator of the site and you want to checkout the wiki sources to give them some love while on a train journey.
+2. Or you are writing a complex document and you want to simply use your favourite $EDITOR
+3. Learn a little more about [git](http://git.or.cz/)
 
-Use case I am trying to accomplish: Edit wiki pages offline.
+# Workflow
 
-# on monty (my laptop)
+## on webconverger.org/si.dabase.com/hendry
+
+Wiki page created with [ikiwiki](http://ikiwiki.info). Example usb.mdwn [usb](http://webconverger.org/usb/)
+
+## on monty (my laptop)
 
 I wonder why a "pull" doesn't just init a repo like a "svn co" does?
 
     monty:~/git-testing% git-init
     Initialized empty Git repository in .git/
 
+You might want to set some config variables like your email as this [tutorial](http://www.kernel.org/pub/software/scm/git/docs/tutorial.html) describes.
+
     monty:~/git-testing% git-pull ssh://si.dabase.com/home/hendry/wikiwc/.git/
     warning: no common commits
     remote: Generating pack...
@@ -43,5 +51,31 @@ I wonder why a "pull" doesn't just init a repo like a "svn co" does?
     refs/heads/master: 75a4a8e94e5fff2a4beced1574e772742d3f9847 -> d3507dfe19b469e61a728d1b0a833a5f480f5802
 
 
-# on si
+## on webconverger.org/si.dabase.com/hendry
+
+    hendry:239$ git-status 
+    # On branch master
+    # Changes to be committed:
+    #   (use "git reset HEAD <file>..." to unstage)
+    #
+    #       modified:   usb.mdwn
+    #
+    # Untracked files:
+    #   (use "git add <file>..." to include in what will be committed)
+    #
+    #       .ikiwiki/
+
+Great, we see the usb.mdwn file has been modified. Now we need to check it out to update the local work tree (and the wiki?)
+
+    hendry:242$ git-checkout master usb.mdwn
+
+
+# Stuff I am confused about
+
+* this master/origin stuff
+* why do I have to explicitly say the filename "usb.mdwn" for it to be updated?
+* why do I have to explicitly have to write the url if I am going a git-pull again? I know I can alias it, but why can't it just pull from the last source?
+
+# Ack
 
+Thanks to gitte on #git on Freenode
\ No newline at end of file