git-*: convert options to longform and minor fixes (#13441)

Co-authored-by: spageektti <git@spageektti.cc>
Co-authored-by: Fazle Arefin <fazlearefin@users.noreply.github.com>

pages/common/git-rebase.md

@@ -10,7 +10,7 @@
 
 - Start an interactive rebase, which allows the commits to be reordered, omitted, combined or modified:
 
-`git rebase -i {{target_base_branch_or_commit_hash}}`
+`git rebase {{--interactive|-i}} {{target_base_branch_or_commit_hash}}`
 
 - Continue a rebase that was interrupted by a merge failure, after editing conflicting files:
 
@@ -30,8 +30,8 @@
 
 - Reapply the last 5 commits in-place, stopping to allow them to be reordered, omitted, combined or modified:
 
-`git rebase -i {{HEAD~5}}`
+`git rebase {{--interactive|-i}} {{HEAD~5}}`
 
 - Auto-resolve any conflicts by favoring the working branch version (`theirs` keyword has reversed meaning in this case):
 
-`git rebase -X theirs {{branch_name}}`
+`git rebase {{--strategy-option|-X}} theirs {{branch_name}}`