X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=60d08b65cd08da824ce1a8b049740a6fe60bebed;hb=56f550d92dde40538303f0011fa67cb276f197de;hp=fcde2947d95f636bea58d0c44cf25319f3be018e;hpb=6ede3809f3ccaa699382ccee5c2c2f84f98ea40a;p=git-wiki.git

diff --git a/pep-git.txt b/pep-git.txt
index fcde294..60d08b6 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -14,7 +14,7 @@ Abstract
 
 This Informational PEP collects information about git. There is, of
 course, a lot of documentation for git, so the PEP concentrates on
-more complex issues, scenarios and topics.
+more complex issues, scenarios and examples.
 
 The plan is to extend the PEP in the future collecting information
 about equivalence of Mercurial and git scenarios to help migrating
@@ -30,6 +30,7 @@ Documentation
 Git is accompanied with a lot of documentation, both online and
 offline.
 
+
 Documentation for starters
 --------------------------
 
@@ -45,6 +46,7 @@ Git Tutorial: `part 1
 `Git workflows
 <https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html>`_.
 
+
 Advanced documentation
 ----------------------
 
@@ -59,6 +61,7 @@ many different languages. Download Russian translation from `GArik
 
 `Git Wiki <https://git.wiki.kernel.org/index.php/Main_Page>`_.
 
+
 Offline documentation
 ---------------------
 
@@ -92,6 +95,7 @@ written in Python and GPL licensed. Linux, Windows, MacOS X.
 `TortoiseGit <https://tortoisegit.org/>`_ is a Windows Shell Interface
 to Git based on TortoiseSVN; open source.
 
+
 Initial configuration
 ---------------------
 
@@ -185,6 +189,7 @@ remote-tracking branches, creates a local branch ``v1``, configure it
 to track upstream remotes/origin/v1 branch and checks out ``v1`` into
 the working directory.
 
+
 Updating local and remote-tracking branches
 -------------------------------------------
 
@@ -362,6 +367,7 @@ Or push all tags at once::
 Don't move tags with ``git tag -f`` or remove tags with ``git tag -d``
 after they have been published.
 
+
 Private information
 '''''''''''''''''''
 
@@ -423,6 +429,7 @@ Undo
 
 Whatever you do, don't panic. Almost anything in git can be undone.
 
+
 git checkout: restore file's content
 ------------------------------------
 
@@ -438,6 +445,7 @@ i.e. ``git checkout README`` restores README to the latest commit.
 (Do not use ``git checkout`` to view a content of a file in a commit,
 use ``git cat-file -p``; e.g. ``git cat-file -p HEAD~:path/to/README``).
 
+
 git reset: remove (non-pushed) commits
 --------------------------------------
 
@@ -453,6 +461,7 @@ Default is mixed. ProGit `explains
 difference very clearly. Bare repositories don't have indices or
 working trees so in a bare repo only soft reset is possible.
 
+
 Unstaging
 '''''''''
 
@@ -462,6 +471,7 @@ committing. See `The Book
 <https://git-scm.com/book/en/Git-Basics-Undoing-Things>`_ for details
 about unstaging and other undo tricks.
 
+
 git reflog: reference log
 -------------------------
 
@@ -504,6 +514,7 @@ do something like::
     $ git cherry-pick save-master~ save-master
     $ git branch -D save-master # remove temporary branch
 
+
 git revert: revert a commit
 ---------------------------
 
@@ -519,6 +530,7 @@ undo the code created by the merge commit but it cannot undo the fact
 of merge. See the discussion `How to revert a faulty merge
 <https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.html>`_.
 
+
 One thing that cannot be undone
 -------------------------------
 
@@ -772,6 +784,7 @@ BTW, there is a difference between running ``git grep -O`` and ``git
 grep -Oless`` - in the latter case ``git grep`` passes ``+/pattern``
 option to less.
 
+
 bash/zsh completion
 -------------------
 
@@ -790,6 +803,7 @@ the latest and greatest download necessary file from `git contrib
 Git-for-windows comes with git-bash for which bash completion is
 installed and enabled.
 
+
 bash/zsh prompt
 ---------------
 
@@ -827,18 +841,19 @@ Perl and C). In addition to web interface both provide read-only dumb
 http access for git (http(s):// URLs).
 
 There are also more advanced web-based development environments that
-include ability to create and manage users and groups, private, group
-and public repositories, and usually include issue trackers, wiki
-pages and other developers tools. Among these environments are
-`Kallithea <https://kallithea-scm.org/>`_ and `pagure
-<https://pagure.io/>`_, both are written in Python; `Gogs
-<http://gogs.io/>`_ is written in Go; when its development seemed to
-be stagnated there was a fork `Gitea <http://gitea.io/>`_, still
-active.
-
-And last but not least `Gitlab <https://about.gitlab.com/>`_. It's the
-most advanced web-based development environment. Written in Ruby,
-community edition is free and open source (MIT license).
+include ability to manage users, groups and projects; private, group
+and public repositories; and often include issue trackers, wiki pages,
+pull requests and other tools for development and communication. Among
+these environments are `Kallithea <https://kallithea-scm.org/>`_ and
+`pagure <https://pagure.io/>`_, both are written in Python; pagure was
+written by Fedora developers and is being used to develop some Fedora
+projects. `Gogs <http://gogs.io/>`_ is written in Go; there is a fork
+`Gitea <http://gitea.io/>`_.
+
+And last but not least `Gitlab <https://about.gitlab.com/>`_. It's
+perhaps the most advanced git web-based development environment.
+Written in Ruby, community edition is free and open source (MIT
+license).
 
 
 From Mercurial to git