Merge pull request #895 from vanpipy/feature/optional-start-point-when-creeate-branch

feat(#861): add optional parameter --from to set the start point

Author: spacewander

bin/git-create-branch

@@ -20,6 +20,12 @@ do
 				REMOTE=origin
 			fi
 			;;
+		--from)
+			if [[ -n $2 ]]; then
+				START_POINT=$2
+				shift
+			fi
+			;;
 		*)
 			BRANCH=$1
 	esac
@@ -44,9 +50,15 @@ then
 	rm -f "$stderr"
 	if [ $REMOTE_EXIT -eq 0 ]
 	then
-		git push $REMOTE HEAD:refs/heads/$BRANCH
-		git fetch $REMOTE
-		git checkout --track -b $BRANCH $REMOTE/$BRANCH
+		if [[ -n $START_POINT ]]; then
+			git fetch $REMOTE
+			git checkout --track -b $BRANCH $START_POINT
+			git push $REMOTE HEAD:refs/heads/$BRANCH
+		else
+			git push $REMOTE HEAD:refs/heads/$BRANCH
+			git fetch $REMOTE
+			git checkout --track -b $BRANCH $REMOTE/$BRANCH
+		fi
 		exit $?
 	else
 		echo
@@ -56,4 +68,9 @@ then
 	fi
 fi
 
-git checkout -b $BRANCH
+if [[ -n $START_POINT ]]
+then
+    git checkout -b $BRANCH $START_POINT
+else
+    git checkout -b $BRANCH
+fi

bin/git-feature

@@ -32,6 +32,10 @@ do
   --squash )
     merge_mode="--squash"
     ;;
+  --from )
+    start_point=$2
+    shift
+    ;;
   * )
     argv+=($1)
     ;;
@@ -55,10 +59,24 @@ else
   else
     branch="$branch_prefix"/"${argv[0]}"
   fi
-  if [[ -n $remote ]]
+
+  if [[ -n $remote ]] && [[ -z $start_point ]]
   then
     git create-branch -r $remote $branch
-  else
+  fi
+
+  if [[ -z $remote ]] && [[ -z $start_point ]]
+  then
     git create-branch $branch
   fi
+
+  if [[ -n $remote ]] && [[ -n $start_point ]]
+  then
+    git create-branch -r $remote --from $start_point $branch
+  fi
+
+  if [[ -z $remote ]] && [[ -n $start_point ]]
+  then
+    git create-branch --from $start_point $branch
+  fi
 fi

man/git-create-branch.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-CREATE\-BRANCH" "1" "June 2019" "" "Git Extras"
+.TH "GIT\-CREATE\-BRANCH" "1" "November 2020" "" "Git Extras"
 .
 .SH "NAME"
 \fBgit\-create\-branch\fR \- Create branches
@@ -19,6 +19,12 @@ Creates local branch named <branchname> and optionally sets up a remote tracking
 Setup a remote tracking branch using \fBremote_name\fR\. If \fBremote_name\fR is not supplied, use \fBorigin\fR by default\.
 .
 .P
+<\-\-from [start_point]>
+.
+.P
+Setup a start point when the branch created\. If \fB\-\-from\fR is not supplied, use the current branch by default\.
+.
+.P
 <branchname>
 .
 .P

man/git-create-branch.html

@@ -15,6 +15,10 @@ Creates local branch named <branchname> and optionally sets up a remote tr
 
 Setup a remote tracking branch using `remote_name`. If `remote_name` is not supplied, use `origin` by default.
 
+<--from [start_point]>
+
+Setup a start point when the branch created. If `--from` is not supplied, use the current branch by default.
+
 <branchname>
 
 The name of the branch to create.

man/git-create-branch.md

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-FEATURE" "1" "April 2020" "" "Git Extras"
+.TH "GIT\-FEATURE" "1" "November 2020" "" "Git Extras"
 .
 .SH "NAME"
 \fBgit\-feature\fR \- Create/Merge feature branch
@@ -28,6 +28,12 @@ use \fBbranch_prefix\fR instead of \fBfeature\fR
 Setup a remote tracking branch using \fBremote_name\fR\. If \fBremote_name\fR is not supplied, use \fBorigin\fR by default\.
 .
 .P
+<\-\-from [start_point]>
+.
+.P
+Setup a start point when the branch created\. If \fB\-\-from\fR is not supplied, use the current branch by default\.
+.
+.P
 <finish>
 .
 .P

man/git-feature.1

@@ -20,6 +20,10 @@ git-feature(1) -- Create/Merge feature branch
 
   Setup a remote tracking branch using `remote_name`. If `remote_name` is not supplied, use `origin` by default.
 
+  <--from [start_point]>
+
+  Setup a start point when the branch created. If `--from` is not supplied, use the current branch by default.
+
   <finish>
 
   Merge and delete the feature branch.