X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=620427afb6613a0ea03f53240fb294fcc0fe9aee;hb=3b93d9f1aff6a1bc5fb9b9598f0a94b9b314dedd;hp=80d2a8466fae3bf762b14175aee56c3131ff8d4e;hpb=c3b324710482c485a2aef51c26bc450f337da2a8;p=git-wiki.git

diff --git a/pep-git.txt b/pep-git.txt
index 80d2a84..620427a 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -7,7 +7,7 @@ Status: Draft
 Type: Informational
 Content-Type: text/x-rst
 Created: 01-Jun-2015
-Post-History: 
+Post-History: 12-Sep-2015
 
 Abstract
 ========
@@ -43,7 +43,7 @@ Git Tutorial: `part 1
 `Git User's manual
 <https://www.kernel.org/pub/software/scm/git/docs/user-manual.html>`_.
 `Everyday GIT With 20 Commands Or So
-<https://www.kernel.org/pub/software/scm/git/docs/everyday.html>`_.
+<https://www.kernel.org/pub/software/scm/git/docs/giteveryday.html>`_.
 `Git workflows
 <https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html>`_.
 
@@ -784,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
@@ -835,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).
@@ -865,16 +872,16 @@ 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
+bidirectional (pull and push) access to Mercurial repositories from
+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.
+that seems to be mostly objective.
 
 To use git-remote-hg, install or clone it, add to your PATH (or copy
 script ``git-remote-hg`` to a directory that's already in PATH) and
@@ -894,6 +901,10 @@ At the second half of the page there is a table that lists
 corresponding Mercurial and git commands. Should work perfectly in
 both directions.
 
+Python Developer's Guide also has a chapter `Mercurial for git
+developers <https://docs.python.org/devguide/gitdevs.html>`_ that
+documents a few differences between git and hg.
+
 
 Copyright
 =========