From 98208061b475f2e2cba708c3120035f2951c9955 Mon Sep 17 00:00:00 2001 From: rkiel Date: Sun, 7 Jun 2015 19:12:50 -0400 Subject: [PATCH] merge-commit-and-feature: commit update README.md --- README.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 71104b5..a17661e 100644 --- a/README.md +++ b/README.md @@ -132,15 +132,26 @@ my-feature-name: this is a sample commit message #### End -Use the `end` subcommand to close out the feature. -The standard branch will be checkout and the local feature branch will be forcibly deleted. -Make sure that your changes have been merged. -If there is a backup copy on `origin`, it will also be removed. +Use the `end` subcommand to safely close out the feature. +The standard branch will be checkout and the local feature branch will be deleted. +This command will fail if you have not merged your changes. +If successful and there is a backup copy on `origin`, it will also be removed. ``` feature end ``` +#### Trash + +Use the `trash` subcommand to forcibly close out the feature. +The standard branch will be checkout and the local feature branch will be forcibly deleted. +Make sure that your changes have been merged because they will be lost. +If there is a backup copy on `origin`, it will also be removed. + +``` +feature trash +``` + ## Xgrep utility This utility makes it easier to use git-grep.