X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=08880df1ab19290f79993c33774f683c7980266a;hb=cd5d694aab5e95354ed529716dff4db7bf13e9cb;hp=942aa34b002272f3714527a267b9f323d376b24f;hpb=d6e28ebc67d2eb71fb3350522f137f095b8bb21c;p=git-wiki.git

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