[PATCH 1/6] [Outreachy] merge-ours: include parse-option.h

From: "george espinoza via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: George Espinoza <gespinoz2019@gmail.com>,
	Junio C Hamano <gitster@pobox.com>,
	george espinoza <gespinoz2019@gmail.com>
Subject: [PATCH 1/6] [Outreachy] merge-ours: include parse-option.h
Date: Thu, 07 Nov 2019 08:09:55 +0000	[thread overview]
Message-ID: <5e3b370b3bf8f34cd975da41fb2a7cc0f633954a.1573114201.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.449.git.1573114201.gitgitgadget@gmail.com>

From: george espinoza <gespinoz2019@gmail.com>

Prepare this command which currently handles its own argv to use
parse-options instead. A lot of the commands already have
parse-options and in git.c cmd_struct with the "NO_PARSEOPT" are
the one's that still need it.

Signed-off-by: george espinoza <gespinoz2019@gmail.com>
---
 builtin/merge-ours.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c
index 4594507420..3980f4899a 100644
--- a/builtin/merge-ours.c
+++ b/builtin/merge-ours.c
@@ -11,6 +11,11 @@
 #include "git-compat-util.h"
 #include "builtin.h"
 #include "diff.h"
+#include "parse-options.h"
+
+/* parse-options.h added to initiate replacement of manual option parsing
+ * with parse-options. 
+ */
 
 static const char builtin_merge_ours_usage[] =
 	"git merge-ours <base>... -- HEAD <remote>...";
-- 
gitgitgadget

