Merge pull request tj#398 from nicolaiskogheim/git-graft

graft: Require destination branch. Fix tj#23
tardypad · Jul 25, 2015 · 9b294c4 · 9b294c4
2 parents 9e238c8 + 4e0724b
commit 9b294c4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/bin/git-graft b/bin/git-graft
@@ -4,6 +4,7 @@ src=$1
 dst=$2
 
 test -z $src && echo "source branch required." 1>&2 && exit 1
+test -z $dst && echo "destination branch required." 1>&2 && exit 1
 
 git checkout $dst \
   && git merge --no-ff $src \

diff --git a/man/git-graft.1 b/man/git-graft.1
@@ -7,10 +7,10 @@
 \fBgit\-graft\fR \- Merge and destroy a given branch
 .
 .SH "SYNOPSIS"
-\fBgit\-graft\fR <src\-branch> [<dest\-branch>]
+\fBgit\-graft\fR <src\-branch> <dest\-branch>
 .
 .SH "DESCRIPTION"
-Merge commits from <src\-branch> into <dest\-branch> which defaults to the current branch\.
+Merge commits from <src\-branch> into <dest\-branch>
 .
 .SH "OPTIONS"
 <src\-branch>
@@ -23,7 +23,6 @@ Merge commits from <src\-branch> into <dest\-branch> which defaults to the curre
 .nf
 
 $ git graft new_feature dev
-$ git graft new_feature
 .
 .fi
 .

diff --git a/man/git-graft.html b/man/git-graft.html
diff --git a/man/git-graft.md b/man/git-graft.md
@@ -3,11 +3,11 @@ git-graft(1) -- Merge and destroy a given branch
 
 ## SYNOPSIS
 
-`git-graft` &lt;src-branch&gt; [&lt;dest-branch&gt;]
+`git-graft` &lt;src-branch&gt; &lt;dest-branch&gt;
 
 ## DESCRIPTION
 
-  Merge commits from &lt;src-branch&gt; into &lt;dest-branch&gt; which defaults to the current branch.
+  Merge commits from &lt;src-branch&gt; into &lt;dest-branch&gt;
 
 ## OPTIONS
 
@@ -18,7 +18,6 @@ git-graft(1) -- Merge and destroy a given branch
 ## EXAMPLES
 
     $ git graft new_feature dev
-    $ git graft new_feature
 
 ## AUTHOR