X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-103.txt;h=eae4ff757681af75e11d5837e3b5753737edf71b;hb=dd3e04dae75f9c5215cc18eeb7e96c90b13158f1;hp=f6e8e6d4d8d7d8e780910de4e0f189a37d65b753;hpb=7f68f51eba2ce781058bb09cdd069d8b78a175ba;p=git-wiki.git
diff --git a/pep-103.txt b/pep-103.txt
index f6e8e6d..eae4ff7 100644
--- a/pep-103.txt
+++ b/pep-103.txt
@@ -532,11 +532,11 @@ For example, if you want to reset the branch ``master`` back to the
original commit but preserve two commits created in the current branch
do something like::
- $ git branch save-master # create a new branch saving master
- $ git reflog # find the original place of master
+ $ git branch save-master # create a new branch saving master
+ $ git reflog # find the original place of master
$ git reset $COMMIT_ID
$ git cherry-pick save-master~ save-master
- $ git branch -D save-master # remove temporary branch
+ $ git branch -D save-master # remove temporary branch
git revert: revert a commit
@@ -714,6 +714,25 @@ command. For example::
$ git check-attr -a -- \*.py
+Useful assets
+-------------
+
+`GitAlias `_ (`repository
+`_) is a big collection of
+aliases. A careful selection of aliases for frequently used commands
+could save you a lot of keystrokes!
+
+`GitIgnore `_ and
+https://github.com/github/gitignore are collections of ``.gitignore``
+files for all kinds of IDEs and programming languages. Python
+included!
+
+`pre-commit `_ (`repositories
+`_) is a framework for managing and
+maintaining multi-language pre-commit hooks. The framework is written
+in Python and has a lot of plugins for many programming languages.
+
+
Advanced topics
===============
@@ -754,7 +773,7 @@ Wiki.
Root
-====
+----
Git switches to the root (top-level directory of the project where
``.git`` subdirectory exists) before running any command. Git
@@ -782,7 +801,7 @@ we run the commands from a subdirectory, not from the root.
ReReRe
-======
+------
Rerere is a mechanism that helps to resolve repeated merge conflicts.
The most frequent source of recurring merge conflicts are topic
@@ -811,7 +830,7 @@ Book.
Database maintenance
-====================
+--------------------
Git object database and other files/directories under ``.git`` require
periodic maintenance and cleanup. For example, commit editing left
@@ -869,7 +888,7 @@ has an option ``-O`` that passes a list of names of the found files to
a program; default program for ``-O`` is a pager (usually ``less``),
but you can use your editor::
- $ git grep -Ovim # but not -O vim
+ $ git grep -Ovim # but not -O vim
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