From d29e315f87185cf96287078a59bc9552ed04781c Mon Sep 17 00:00:00 2001
From: Vincent Driessen <vincent@datafox.nl>
Date: Tue, 9 Feb 2010 00:55:06 +0100
Subject: [PATCH] Annotated the code with some TODO-notes.

---
 git-flow-hotfix  | 2 ++
 git-flow-release | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/git-flow-hotfix b/git-flow-hotfix
index 2bceb5e4f..4333e3092 100644
--- a/git-flow-hotfix
+++ b/git-flow-hotfix
@@ -201,6 +201,8 @@ cmd_finish() {
 		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?
diff --git a/git-flow-release b/git-flow-release
index 8c12f65f9..9750cc8d2 100644
--- a/git-flow-release
+++ b/git-flow-release
@@ -206,6 +206,9 @@ cmd_finish() {
 	if ! gitflow_is_branch_merged_into $BRANCH $DEVELOP_BRANCH; then
 		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?