From cd5d694aab5e95354ed529716dff4db7bf13e9cb Mon Sep 17 00:00:00 2001
From: Oleg Broytman <phd@phdru.name>
Date: Sun, 23 Aug 2015 00:01:44 +0300
Subject: [PATCH] Explain tricky options (git log -p3)

---
 pep-git.txt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pep-git.txt b/pep-git.txt
index 942aa34..08880df 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -741,9 +741,17 @@ that's not an error, just a reminder to perform regular maintenance.
 Tips and tricks
 ===============
 
-TODO: sticky options; example: git grep -O.
+Command-line options and arguments
+----------------------------------
+
+`git help cli
+<https://www.kernel.org/pub/software/scm/git/docs/gitcli.html>`_
+recommends not to combine short options/flags. Most of the times it
+works: ``git commit -av`` works perfectly, but there are situations
+when it doesn't. E.g., ``git log -p -5`` cannot be combined as ``git
+log -p5``.
 
-TODO: tricky options; example: git log -p3.
+TODO: sticky options; example: git grep -O.
 
 TODO: bash/zsh completion, bash/zsh prompt.
 https://git.kernel.org/cgit/git/git.git/tree/contrib/completion
-- 
2.39.2