From: Jakub Suder <jakub.suder@gmail.com>
Date: Tue, 12 Jan 2010 21:38:21 +0000 (+0100)
Subject: changed alias for --prefix from -p to -P
X-Git-Tag: v1.7.11-rc0~176^2~25^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e25f79f353a1c1f454ae0c44aa45ff3ab44551c;p=git.git

changed alias for --prefix from -p to -P
---

diff --git a/git-subtree.sh b/git-subtree.sh
index cdf7b0992..0a5cafa77 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -16,7 +16,7 @@ git subtree split --prefix=<prefix> <commit...>
 h,help        show the help
 q             quiet
 d             show debug messages
-p,prefix=     the name of the subdir to split out
+P,prefix=     the name of the subdir to split out
 m,message=    use the given message as the commit message for the merge commit
  options for 'split'
 annotate=     add a prefix to commit message of new commits
@@ -78,7 +78,7 @@ while [ $# -gt 0 ]; do
 		--annotate) annotate="$1"; shift ;;
 		--no-annotate) annotate= ;;
 		-b) branch="$1"; shift ;;
-		-p) prefix="$1"; shift ;;
+		-P) prefix="$1"; shift ;;
 		-m) message="$1"; shift ;;
 		--no-prefix) prefix= ;;
 		--onto) onto="$1"; shift ;;