| commit | d29e315f87185cf96287078a59bc9552ed04781c | [log] [tgz] |
|---|---|---|
| author | Vincent Driessen <vincent@datafox.nl> | 周二 2月 09 00:55:06 2010 +0100 |
| committer | Vincent Driessen <vincent@datafox.nl> | 周二 2月 09 00:55:06 2010 +0100 |
| tree | cf677cc44fb87bc154c7e10ca369e000cf2a45bd | |
| parent | 5fa4758e54e6b3fd0c1dfbd76fa246dc59e674f8 [diff] [blame] |
Annotated the code with some TODO-notes.
diff --git a/git-flow-hotfix b/git-flow-hotfix index 2bceb5e..4333e30 100644 --- a/git-flow-hotfix +++ b/git-flow-hotfix
@@ -201,6 +201,8 @@ git checkout $DEVELOP_BRANCH || \ die "Could not check out $DEVELOP_BRANCH." + # TODO: Actually, accounting for 'git describe' pays, so we should + # ideally git merge --no-ff $tagname here, instead! git merge --no-ff $BRANCH || \ die "There were merge conflicts." # TODO: What do we do now?