X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-103.txt;h=f6e8e6d4d8d7d8e780910de4e0f189a37d65b753;hb=7f68f51eba2ce781058bb09cdd069d8b78a175ba;hp=d11403345a0d6bd24fc863992becc4ac7b907f23;hpb=7ba22e6bc0b8a7e77d5c3e26995e458fb2784976;p=git-wiki.git

diff --git a/pep-103.txt b/pep-103.txt
index d114033..f6e8e6d 100644
--- a/pep-103.txt
+++ b/pep-103.txt
@@ -753,6 +753,34 @@ See `WhatIsTheIndex
 Wiki.
 
 
+Root
+====
+
+Git switches to the root (top-level directory of the project where
+``.git`` subdirectory exists) before running any command. Git
+remembers though the directory that was current before the switch.
+Some programs take into account the current directory. E.g., ``git
+status`` shows file paths of changed and unknown files relative to the
+current directory; ``git grep`` searches below the current directory;
+``git apply`` applies only those hunks from the patch that touch files
+below the current directory.
+
+But most commands run from the root and ignore the current directory.
+Imagine, for example, that you have two work trees, one for the branch
+``v1`` and the other for ``master``. If you want to merge ``v1`` from
+a subdirectory inside the second work tree you must write commands as
+if you're in the top-level dir. Let take two work trees,
+``project-v1`` and ``project``, for example::
+
+    $ cd project/subdirectory
+    $ git fetch ../project-v1 v1:v1
+    $ git merge v1
+
+Please note the path in ``git fetch ../project-v1 v1:v1`` is
+``../project-v1`` and not ``../../project-v1`` despite the fact that
+we run the commands from a subdirectory, not from the root.
+
+
 ReReRe
 ======
 
@@ -846,12 +874,12 @@ but you can use your editor::
 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
+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,
+like ``git config [--global] core.pager less -FRSXgimq``); fortunately,
 ``git grep -Oless`` always passes the pattern.