Skip to content

Commit 9b294c4

Browse files
committed
Merge pull request tj#398 from nicolaiskogheim/git-graft
graft: Require destination branch. Fix tj#23
2 parents 9e238c8 + 4e0724b commit 9b294c4

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

bin/git-graft

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ src=$1
44
dst=$2
55

66
test -z $src && echo "source branch required." 1>&2 && exit 1
7+
test -z $dst && echo "destination branch required." 1>&2 && exit 1
78

89
git checkout $dst \
910
&& git merge --no-ff $src \

man/git-graft.1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
\fBgit\-graft\fR \- Merge and destroy a given branch
88
.
99
.SH "SYNOPSIS"
10-
\fBgit\-graft\fR <src\-branch> [<dest\-branch>]
10+
\fBgit\-graft\fR <src\-branch> <dest\-branch>
1111
.
1212
.SH "DESCRIPTION"
13-
Merge commits from <src\-branch> into <dest\-branch> which defaults to the current branch\.
13+
Merge commits from <src\-branch> into <dest\-branch>
1414
.
1515
.SH "OPTIONS"
1616
<src\-branch>
@@ -23,7 +23,6 @@ Merge commits from <src\-branch> into <dest\-branch> which defaults to the curre
2323
.nf
2424

2525
$ git graft new_feature dev
26-
$ git graft new_feature
2726
.
2827
.fi
2928
.

man/git-graft.html

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/git-graft.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ git-graft(1) -- Merge and destroy a given branch
33

44
## SYNOPSIS
55

6-
`git-graft` &lt;src-branch&gt; [&lt;dest-branch&gt;]
6+
`git-graft` &lt;src-branch&gt; &lt;dest-branch&gt;
77

88
## DESCRIPTION
99

10-
Merge commits from &lt;src-branch&gt; into &lt;dest-branch&gt; which defaults to the current branch.
10+
Merge commits from &lt;src-branch&gt; into &lt;dest-branch&gt;
1111

1212
## OPTIONS
1313

@@ -18,7 +18,6 @@ git-graft(1) -- Merge and destroy a given branch
1818
## EXAMPLES
1919

2020
$ git graft new_feature dev
21-
$ git graft new_feature
2221

2322
## AUTHOR
2423

0 commit comments

Comments
 (0)