[PATCH 1/2] Teach 'rebase -i' to accept and ignore the -f/--force-rebase option.

[Marc Branchaud <marcnarc@xiplink.com>]

An interactive rebase implies -f:  The user wants to rewrite some of the
branch's own commits.
---
 git-rebase--interactive.sh |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 3e4fd14..aa0ab1a 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -22,6 +22,7 @@ p,preserve-merges  try to recreate merges instead of ignoring them
 s,strategy=        use the given merge strategy
 m,merge            always used (no-op)
 i,interactive      always used (no-op)
+f,force-rebase     always used (no-op)
  Actions:
 continue           continue rebasing process
 abort              abort rebasing process and restore original branch
@@ -733,6 +734,9 @@ first and then run 'git rebase --continue' again."
 	-m)
 		# we use merge anyway
 		;;
+	-f)
+		# we don't need to be forced
+		;;
 	-v)
 		VERBOSE=t
 		;;
-- 
1.7.0.3.1.g59254.dirty