add Page _Sidebars

2010-12-02 18:16:37 -08:00
parent 2f648d05b4
commit 2cbe3957cf
40 changed files with 850 additions and 28 deletions
@@ -0,0 +1 @@
+add sidebars
@@ -1,5 +1,12 @@
 [core]
 	repositoryformatversion = 0
 	filemode = true
-	bare = true
+	bare = false
+	logallrefupdates = true
 	ignorecase = true
+[remote "origin"]
+	fetch = +refs/heads/*:refs/remotes/origin/*
+	url = /Users/rick/p/gollum/test/examples/lotr.git
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # An example hook script to check the commit log message.
-# Called by git-commit with one argument, the name of the file
+# Called by "git commit" with one argument, the name of the file
 # that has the commit message.  The hook should exit with non-zero
 # status after issuing an appropriate message if it wants to stop the
 # commit.  The hook is allowed to edit the commit message file.
@@ -5,4 +5,4 @@
 #
 # To enable this hook, rename this file to "post-update".

-exec git-update-server-info
+exec git update-server-info
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # An example hook script to verify what is about to be committed.
-# Called by git-commit with no arguments.  The hook should
+# Called by "git commit" with no arguments.  The hook should
 # exit with non-zero status after issuing an appropriate message if
 # it wants to stop the commit.
 #
 # To enable this hook, rename this file to "pre-commit".

-if git-rev-parse --verify HEAD >/dev/null 2>&1
+if git rev-parse --verify HEAD >/dev/null 2>&1
 then
 	against=HEAD
 else
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2006, 2008 Junio C Hamano
 #
-# The "pre-rebase" hook is run just before "git-rebase" starts doing
+# The "pre-rebase" hook is run just before "git rebase" starts doing
 # its job, and can prevent the command from running by exiting with
 # non-zero status.
 #
@@ -43,7 +43,7 @@ git show-ref -q "$topic" || {
 }

 # Is topic fully merged to master?
-not_in_master=`git-rev-list --pretty=oneline ^master "$topic"`
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
 if test -z "$not_in_master"
 then
 	echo >&2 "$topic is fully merged to master; better remove it."
@@ -51,11 +51,11 @@ then
 fi

 # Is topic ever merged to next?  If so you should not be rebasing it.
-only_next_1=`git-rev-list ^master "^$topic" ${publish} | sort`
-only_next_2=`git-rev-list ^master           ${publish} | sort`
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
 if test "$only_next_1" = "$only_next_2"
 then
-	not_in_topic=`git-rev-list "^$topic" master`
+	not_in_topic=`git rev-list "^$topic" master`
 	if test -z "$not_in_topic"
 	then
 		echo >&2 "$topic is already up-to-date with master"
@@ -64,8 +64,8 @@ then
 		exit 0
 	fi
 else
-	not_in_next=`git-rev-list --pretty=oneline ^${publish} "$topic"`
-	perl -e '
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
 		my $topic = $ARGV[0];
 		my $msg = "* $topic has commits already merged to public branch:\n";
 		my (%not_in_next) = map {
@@ -157,13 +157,13 @@ B to be deleted.

 To compute (1):

-	git-rev-list ^master ^topic next
-	git-rev-list ^master        next
+	git rev-list ^master ^topic next
+	git rev-list ^master        next

 	if these match, topic has not merged in next at all.

 To compute (2):

-	git-rev-list master..topic
+	git rev-list master..topic

 	if this is empty, it is fully merged to "master".
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # An example hook script to prepare the commit log message.
-# Called by git-commit with the name of the file that has the
+# Called by "git commit" with the name of the file that has the
 # commit message, followed by the description of the commit
 # message's source.  The hook's purpose is to edit the commit
 # message file.  If the hook fails with a non-zero status,
@@ -22,10 +22,10 @@

 case "$2,$3" in
  merge,)
-    perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;

 # ,|template,)
-#   perl -i.bak -pe '
+#   /usr/bin/perl -i.bak -pe '
 #      print "\n" . `git diff --cached --name-status -r`
 #	 if /^#/ && $first++ == 0' "$1" ;;

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # An example hook script to blocks unannotated tags from entering.
-# Called by git-receive-pack with arguments: refname sha1-old sha1-new
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
 #
 # To enable this hook, rename this file to "update".
 #
@@ -64,7 +64,7 @@ zero="0000000000000000000000000000000000000000"
 if [ "$newrev" = "$zero" ]; then
 	newrev_type=delete
 else
-	newrev_type=$(git-cat-file -t $newrev)
+	newrev_type=$(git cat-file -t $newrev)
 fi

 case "$refname","$newrev_type" in
@@ -1,4 +1,4 @@
-# git-ls-files --others --exclude-from=.git/info/exclude
+# git ls-files --others --exclude-from=.git/info/exclude
 # Lines that start with '#' are comments.
 # For a project mostly in C, the following would be a good set of
 # exclude patterns (uncomment them if you want to use them):
@@ -1 +0,0 @@
-d61c3de65957b5997c236393b3ad4d70b5cd8931	refs/heads/master
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 60f12f4254f58801b9ee7db7bca5fa8aeefaa56b rick <technoweenie@gmail.com> 1291341857 -0800	clone: from /Users/rick/p/gollum/test/examples/lotr.git
+60f12f4254f58801b9ee7db7bca5fa8aeefaa56b a8ad3c09dd842a3517085bfadd37718856dee813 rick <technoweenie@gmail.com> 1291341922 -0800	commit: add sidebars
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 60f12f4254f58801b9ee7db7bca5fa8aeefaa56b rick <technoweenie@gmail.com> 1291341857 -0800	clone: from /Users/rick/p/gollum/test/examples/lotr.git
+60f12f4254f58801b9ee7db7bca5fa8aeefaa56b a8ad3c09dd842a3517085bfadd37718856dee813 rick <technoweenie@gmail.com> 1291341922 -0800	commit: add sidebars
@@ -1,2 +1,2 @@
 # pack-refs with: peeled 
-d61c3de65957b5997c236393b3ad4d70b5cd8931 refs/heads/master
+60f12f4254f58801b9ee7db7bca5fa8aeefaa56b refs/remotes/origin/master
@@ -1 +1 @@
-60f12f4254f58801b9ee7db7bca5fa8aeefaa56b
+a8ad3c09dd842a3517085bfadd37718856dee813
@@ -0,0 +1 @@
+ref: refs/remotes/origin/master
@@ -0,0 +1,13 @@
+# Bilbo Baggins
+
+Bilbo Baggins is the protagonist of The [[Hobbit]] and also makes a few
+appearances in The Lord of the Rings, two of the most well-known of [[J. R. R.
+Tolkien]]'s fantasy writings. The story of The Hobbit featuring Bilbo is also
+retold from a different perspective in the Chapter The Quest of Erebor in
+Unfinished Tales.
+
+In Tolkien's narrative conceit, in which all the writings of Middle-earth are
+'really' translations from the fictitious volume of The Red Book of Westmarch,
+Bilbo is the author of The Hobbit and translator of The Silmarillion.
+
+From [http://en.wikipedia.org/wiki/Bilbo_Baggins](http://en.wikipedia.org/wiki/Bilbo_Baggins).
@@ -0,0 +1,3 @@
+FirstName,LastName
+Bilbo,Baggins
+Frodo,Baggins
@@ -0,0 +1,3 @@
+h1. The LOTR Wiki
+
+This wiki is awesome. You can learn about [[Bilbo Baggins]] or some [[evil|Eye Of Sauron]] stuff.
@@ -0,0 +1,37 @@
+# Eye **Of** Sauron
+
+Here are some pictures of the Eye of Sauron!
+
+Just the photo.
+
+[[/Mordor/eye.jpg]]
+
+With alt.
+
+[[/Mordor/eye.jpg|alt=Eye of Sauron]]
+
+With frame and caption.
+
+[[/Mordor/eye.jpg|frame|alt=Eye of Sauron]]
+
+Align left.
+
+[[/Mordor/eye.jpg|align=left]]
+
+Alight center.
+
+[[/Mordor/eye.jpg|align=center]]
+
+Alight right.
+
+[[/Mordor/eye.jpg|align=right]]
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas interdum velit eu justo rutrum vitae semper urna porttitor. Sed viverra bibendum tincidunt. Curabitur vel mi sed nisl vestibulum lobortis eu ac nisl. Morbi fringilla adipiscing felis. Mauris luctus interdum accumsan. Integer leo mauris, dapibus a sollicitudin non, varius non erat. Donec eu dictum orci. Morbi viverra eleifend felis, et adipiscing neque consequat a. Vestibulum accumsan ligula suscipit mi rhoncus ac gravida lectus tincidunt. Donec interdum, [[/Mordor/eye.jpg|float|frame|alt=FIRE FIRE FIRE]] lorem sed interdum molestie, est ipsum pharetra est, sit amet eleifend purus eros at ligula. Aliquam erat volutpat. Sed dignissim interdum ipsum, et pulvinar lectus faucibus et. Ut at lacus risus, non lobortis erat. Proin malesuada sagittis mauris, in posuere turpis tincidunt eu. Nunc accumsan, ligula ut rutrum aliquet, neque metus suscipit ligula, in aliquam augue velit vel orci. Aliquam diam lectus, posuere id faucibus sed, aliquam vel erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas interdum velit eu justo rutrum vitae semper urna porttitor. Sed viverra bibendum tincidunt. Curabitur vel mi sed nisl vestibulum lobortis eu ac nisl. Morbi fringilla adipiscing felis. Mauris luctus interdum accumsan. Integer leo mauris, dapibus a sollicitudin non, varius non erat. Donec eu dictum orci. [[/Mordor/eye.jpg|float|align=right]] Morbi viverra eleifend felis, et adipiscing neque consequat a. Vestibulum accumsan ligula suscipit mi rhoncus ac gravida lectus tincidunt. Donec interdum, lorem sed interdum molestie, est ipsum pharetra est, sit amet eleifend purus eros at ligula. Aliquam erat volutpat. Sed dignissim interdum ipsum, et pulvinar lectus faucibus et. Ut at lacus risus, non lobortis erat. Proin malesuada sagittis mauris, in posuere turpis tincidunt eu. Nunc accumsan, ligula ut rutrum aliquet, neque metus suscipit ligula, in aliquam augue velit vel orci. Aliquam diam lectus, posuere id faucibus sed, aliquam vel erat.
+
+Smaller width.
+
+[[/Mordor/eye.jpg|width=100px]]
+
+Smaller height.
+
+[[/Mordor/eye.jpg|height=100px]]
@@ -0,0 +1 @@
+Ones does not simply **walk** into Mordor!
@@ -0,0 +1 @@
+Ones does not simply **walk** into Mordor!
@@ -0,0 +1 @@
+[ ] Write section on Ents
@@ -0,0 +1 @@
+One ring to rule them all!
@@ -0,0 +1 @@
+Lord of the Rings wiki
@@ -0,0 +1 @@
+Lord of the Rings wiki
				`@@ -1 +0,0 @@`
				`d61c3de65957b5997c236393b3ad4d70b5cd8931 refs/heads/master`