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>
Subject: [PATCH 0/1] [Outreachy] merge-ours: include a parse-option
Date: Mon, 28 Oct 2019 23:42:28 +0000 [thread overview]
Message-ID: <pull.425.git.1572306149.gitgitgadget@gmail.com> (raw)
Teach this command which currently handles its own argv to use parse-options
instead because parse-options helps make sure we handle user input like -h
in a standardized way across the project. Also deleted the NO_PARSEOPT flag
from git.c to coincide with the conversion of the structure in this command
since merge-ours now uses parse-options and needed to update git.c
accordingly.
Outreachy Micro-Project #3
Signed-off-by: george espinoza gespinoz2019@gmail.com
[gespinoz2019@gmail.com]
george espinoza (1):
[Outreachy] merge-ours: include parse-options
builtin/merge-ours.c | 14 ++++++++++----
git.c | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
base-commit: 566a1439f6f56c2171b8853ddbca0ad3f5098770
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-425%2FGeorgecanfly%2Fmerge-ours-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-425/Georgecanfly/merge-ours-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/425
--
gitgitgadget
next reply other threads:[~2019-10-28 23:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 23:42 George Espinoza via GitGitGadget [this message]
2019-10-28 23:42 ` [PATCH 1/1] [Outreachy] merge-ours: include parse-options george espinoza via GitGitGadget
2019-10-29 12:56 ` Johannes Schindelin
2019-10-29 20:42 ` Emily Shaffer
2019-10-30 9:43 ` George Espinoza
2019-10-30 2:05 ` Junio C Hamano
2019-10-30 9:53 ` George Espinoza
2019-10-30 21:58 ` Johannes Schindelin
2019-11-02 4:14 ` Junio C Hamano
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=pull.425.git.1572306149.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).