Permalink
Browse files

Revert unnecessary changes.

  • Loading branch information...
1 parent ad511b6 commit c7e50eed6ed23002778bcaaccd70c4e91a7d5cea @nvie committed Jul 9, 2012
Showing with 10 additions and 10 deletions.
  1. +10 −10 git-flow-feature
View
@@ -9,17 +9,17 @@
# http://github.com/nvie/gitflow
#
# Copyright 2010 Vincent Driessen. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
-#
+#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
-#
+#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-#
+#
# THIS SOFTWARE IS PROVIDED BY VINCENT DRIESSEN ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
@@ -30,7 +30,7 @@
# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
+#
# The views and conclusions contained in the software and documentation are
# those of the authors and should not be interpreted as representing official
# policies, either expressed or implied, of Vincent Driessen.
@@ -244,7 +244,7 @@ cmd_finish() {
# TODO: detect that we're working on the correct branch here!
# The user need not necessarily have given the same $NAME twice here
# (although he/she should).
- #
+ #
# TODO: git_is_clean_working_tree() should provide an alternative
# exit code for "unmerged changes in working tree", which we should
@@ -270,7 +270,7 @@ cmd_finish() {
echo "Merge conflicts not resolved yet, use:"
echo " git mergetool"
echo " git commit"
- echo
+ echo
echo "You can then complete the finish by running it again:"
echo " git flow feature finish $NAME"
echo
@@ -324,7 +324,7 @@ cmd_finish() {
echo "There were merge conflicts. To resolve the merge conflict manually, use:"
echo " git mergetool"
echo " git commit"
- echo
+ echo
echo "You can then complete the finish by running it again:"
echo " git flow feature finish $NAME"
echo
@@ -344,8 +344,8 @@ helper_finish_cleanup() {
if flag fetch; then
git push "$ORIGIN" ":refs/heads/$BRANCH"
fi
-
-
+
+
if noflag keep; then
if flag force_delete; then
git branch -D "$BRANCH"

0 comments on commit c7e50ee

Please sign in to comment.