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 3/6] This file wasn't supposed to change during my git push for check-ref-format :(
Date: Thu, 07 Nov 2019 08:09:57 +0000 [thread overview]
Message-ID: <078a19e86af6fcf1348d8988dc10cfac2e689ba4.1573114201.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.449.git.1573114201.gitgitgadget@gmail.com>
From: george espinoza <gespinoz2019@gmail.com>
Signed-off-by: george espinoza <gespinoz2019@gmail.com>
---
builtin/merge-ours.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c
index 3980f4899a..4594507420 100644
--- a/builtin/merge-ours.c
+++ b/builtin/merge-ours.c
@@ -11,11 +11,6 @@
#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
next prev parent reply other threads:[~2019-11-07 8:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 8:09 [PATCH 0/6] [Outreachy] check-ref-format: parse-options George Espinoza via GitGitGadget
2019-11-07 8:09 ` [PATCH 1/6] [Outreachy] merge-ours: include parse-option.h george espinoza via GitGitGadget
2019-11-07 9:55 ` Junio C Hamano
2019-11-07 8:09 ` [PATCH 2/6] [Outreachy] check-ref-format: parse-options george espinoza via GitGitGadget
2019-11-07 10:25 ` Junio C Hamano
2019-11-09 7:42 ` George Espinoza
2019-11-07 8:09 ` george espinoza via GitGitGadget [this message]
2019-11-07 10:23 ` [PATCH 3/6] This file wasn't supposed to change during my git push for check-ref-format :( Junio C Hamano
2019-11-07 8:09 ` [PATCH 4/6] [Outreachy] check-ref-format: parse options george espinoza via GitGitGadget
2019-11-07 8:09 ` [PATCH 5/6] [Outreachy] check-ref-format: parse-options george espinoza via GitGitGadget
2019-11-07 8:10 ` [PATCH 6/6] " george espinoza via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=078a19e86af6fcf1348d8988dc10cfac2e689ba4.1573114201.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=gespinoz2019@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).