Change wording

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

diff --git a/pep-git.txt b/pep-git.txt
index b8171dbe31dd62e9f13597c713573b11e081a7a8..acc45f3b1db00a1f822193502921e59a58e72ff7 100644 (file)
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -268,10 +268,11 @@ or even
 
     $ git pull
 
-Default remote repository for fetching/pulling is origin. Default set
-of references to fetch is calculated using matching algorithm: git
+Default remote repository for fetching/pulling is ``origin``. Default
+set of references to fetch is calculated using matching algorithm: git
 fetches all branches having the same name on both ends.
 
+
 Push
 ''''
 
@@ -310,8 +311,8 @@ or even
 
     $ git push
 
-Default remote repository for pushing is origin. Default set
-of references to push in git before 2.0 is calculated using matching
+Default remote repository for pushing is ``origin``. Default set of
+references to push in git before 2.0 is calculated using matching
 algorithm: git pushes all branches having the same name on both ends.
 Default set of references to push in git 2.0+ is calculated using
 simple algorithm: git pushes the current branch back to its
@@ -341,6 +342,7 @@ That changed in git 2.3, but see `the blog post
 for caveats; in 2.4 the push-to-deploy feature was `further improved
 <https://github.com/blog/1994-git-2-4-atomic-pushes-push-to-deploy-and-more#push-to-deploy-improvements>`_.
 
+
 Tags
 ''''
 
@@ -782,9 +784,16 @@ but you can use your editor::
 
     $ git grep -Ovim # but not -O vim
 
-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``.
+BTW, if git is instructed to use ``less`` as the pager (i.e., if pager
+is not configured in git at all it uses ``less`` by default, or if it
+gets ``less`` from GIT_PAGER or PAGER environment variables, or if it
+was configured with ``git config --global core.pager less``, or
+``less`` is used in the command ``git grep -Oless``) ``git grep``
+passes ``+/$pattern`` option to ``less`` which is quite convenient.
+Unfortunately, ``git grep`` doesn't pass the pattern if the pager is
+not exactly ``less``, even if it's ``less`` with parameters (something
+like ``git config --global core.pager less -FRSXgimq``); fortunately,
+``git grep -Oless`` always passes the pattern.
 
 
 bash/zsh completion
@@ -833,27 +842,27 @@ repositories can be made user- or group-writeable (see parameter
 ``core.sharedRepository`` in ``git help config``). If that's too
 permissive or too restrictive for some project's needs there is a
 wrapper `gitolite <http://gitolite.com/gitolite/index.html>`_ that can
-be configured to allow access with great granularity; gitolite has a
-lot of documentation.
+be configured to allow access with great granularity; gitolite is
+written in Perl and has a lot of documentation.
 
 Web interface to browse repositories can be created using `gitweb
-<https://git.kernel.org/cgit/git/git.git/tree/gitweb>`_ and `cgit
+<https://git.kernel.org/cgit/git/git.git/tree/gitweb>`_ or `cgit
 <http://git.zx2c4.com/cgit/about/>`_. Both are CGI scripts (written in
 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 manage users, groups and projects; private, group
-and public repositories; they often include issue trackers, wiki
-pages, pull requests and other tools for development and
-communication. Among these environments are `Kallithea
+include ability to manage users, groups and projects; private,
+group-accessible and public repositories; they 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
+And last but not least, `Gitlab <https://about.gitlab.com/>`_. It's
 perhaps the most advanced web-based development environment for git.
 Written in Ruby, community edition is free and open source (MIT
 license).
@@ -863,14 +872,14 @@ From Mercurial to git
 =====================
 
 There are many tools to convert Mercurial repositories to git. The
-most famous are, perhaps, `hg-git <https://hg-git.github.io/>`_ and
+most famous are, probably, `hg-git <https://hg-git.github.io/>`_ and
 `fast-export <http://repo.or.cz/w/fast-export.git>`_ (many years ago
 it was known under the name ``hg2git``).
 
 But a better tool, perhaps the best, is `git-remote-hg
 <https://github.com/felipec/git-remote-hg>`_. It provides transparent
 bidirectional access (pull and push) to Mercurial repositories from
-git. The author wrote a `comparison of alternatives
+git. Its author wrote a `comparison of alternatives
 <https://github.com/felipec/git/wiki/Comparison-of-git-remote-hg-alternatives>`_
 that seems to be mostly unbiased.