Enhance description

[git-wiki.git] / pep-git.txt

diff --git a/pep-git.txt b/pep-git.txt
index 1af6bec10e4daa6670380bccd81aac6bb6abdc82..53e30d6788d807ce29a0f6ca028355276c195587 100644 (file)
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -427,7 +427,7 @@ conflicts at once you can merge the topic branch to the mainline from
 time to time and switch back to the topic branch to continue working
 on it. The entire workflow would be something like::
 
-    $ git checkout -b issue-42  # create and switch to a new branch
+    $ git checkout -b issue-42  # create a new issue branch and switch to it
         ...edit/test/commit...
     $ git checkout v2
     $ git pull --rebase origin v2  # update v2 from the upstream
@@ -438,9 +438,9 @@ on it. The entire workflow would be something like::
 When the topic branch is deleted only the label is removed, commits
 are stayed in the database, they are now merged into v2::
 
-    o--o--o--o--o--M--< v2 - it is the mainline branch
+    o--o--o--o--o--M--< v2 - the mainline branch
         \         /
-         --*--*--*         - it is the topic branch, now unnamed
+         --*--*--*         - the topic branch, now unnamed
 
 The topic branch is deleted to avoid cluttering branch namespace with
 small topic branches. Information on what issue was fixed or what
@@ -499,6 +499,8 @@ Tips and tricks
 
 TODO: sticky options; example: git grep -O.
 
+TODO: tricky options; example: git log -p3.
+
 TODO: bash/zsh completion, bash/zsh prompt.
 https://git.kernel.org/cgit/git/git.git/tree/contrib/completion
 
@@ -508,6 +510,11 @@ git on server
 
 TODO: anonymous access; git over ssh; gitolite; gitweb; cgit; gitlab.
 
+http://gitolite.com/gitolite/index.html
+
+https://git.kernel.org/cgit/git/git.git/tree/gitweb
+
+http://git.zx2c4.com/cgit/
 
 From Mercurial to git
 =====================