From 045eded5712ad43f64f76650581126368d87766a Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 26 Aug 2017 20:45:39 +0100 Subject: [PATCH] Swap order of "git add -i" and "git add -p" Using the -p option is a shorthand to get into the patch section of interactive mode. Hence the -i option is the main one to use. --- common-flow.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common-flow.md b/common-flow.md index f7bd7cb..e3216b6 100644 --- a/common-flow.md +++ b/common-flow.md @@ -209,8 +209,9 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). documentation: 2. You SHOULD never blindly commit all changes with "git commit -a". It is - RECOMMENDED you use "git add -p" or "git add -i" to add individual changes to the staging - area so you are fully aware of what you are committing. + RECOMMENDED you use "git add -i" or "git add -p" to add individual + changes to the staging area so you are fully aware of what you are + committing. 3. You SHOULD always use "--force-with-lease" when doing a force push. The regular "--force" option is dangerous and destructive. More information: