From: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
To: Rohit <rohit.ashiwal265@gmail.com>
Cc: Dscho <Johannes.Schindelin@gmx.de>,
Git Mailing List <git@vger.kernel.org>, Junio <gitster@pobox.com>,
Martin <martin.agren@gmail.com>,
Phillip <phillip.wood123@gmail.com>,
Thomas <t.gummerer@gmail.com>, Elijah <newren@gmail.com>
Subject: [GSoC][PATCH v2 0/1] rebase -i: support --ignore-whitespace
Date: Fri, 19 Jul 2019 00:25:13 +0530 [thread overview]
Message-ID: <20190718185514.20108-1-rohit.ashiwal265@gmail.com> (raw)
In-Reply-To: <20190712185015.20585-1-rohit.ashiwal265@gmail.com>
Another revision to keep the thread alive.
Rohit Ashiwal (1):
rebase -i: add --ignore-whitespace flag
Documentation/git-rebase.txt | 9 +++-
builtin/rebase.c | 26 ++++++++--
sequencer.h | 1 +
t/t3422-rebase-incompatible-options.sh | 1 -
t/t3431-rebase-options-compatibility.sh | 66 +++++++++++++++++++++++++
5 files changed, 97 insertions(+), 6 deletions(-)
create mode 100755 t/t3431-rebase-options-compatibility.sh
Range-diff:
1: 7dda0de288 ! 1: a1bb91fe43 rebase -i: add --ignore-whitespace flag
@@ -85,6 +85,15 @@
OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
N_("rebase strategy")),
OPT_STRING(0, "strategy-opts", &opts.strategy_opts, N_("strategy-opts"),
+@@
+ argc = parse_options(argc, argv, NULL, options,
+ builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
+
++ opts.strategy_opts = xstrdup_or_null(opts.strategy_opts);
++
+ if (!is_null_oid(&squash_onto))
+ opts.squash_onto = &squash_onto;
+
@@
am.git_cmd = 1;
argv_array_push(&am.args, "am");
--
2.21.0
next prev parent reply other threads:[~2019-07-18 18:58 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 18:50 [GSoC][PATCH 0/1] rebase -i: support --ignore-whitespace Rohit Ashiwal
2019-07-12 18:50 ` [GSoC][PATCH 1/1] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-07-15 17:57 ` Junio C Hamano
2019-07-15 22:00 ` Rohit Ashiwal
2019-07-15 22:08 ` Junio C Hamano
2019-07-15 22:42 ` Rohit Ashiwal
2019-07-12 18:53 ` [GSoC][PATCH 0/2] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-07-18 19:03 ` [GSoC][PATCH v2 " Rohit Ashiwal
2019-07-18 19:03 ` [GSoC][PATCH v2 1/2] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-07-18 19:03 ` [GSoC][PATCH v2 2/2] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-07-19 22:36 ` Junio C Hamano
2019-08-02 20:57 ` Rohit Ashiwal
2019-07-20 14:56 ` Phillip Wood
2019-07-23 19:57 ` Rohit Ashiwal
2019-07-24 13:33 ` Phillip Wood
2019-07-19 21:26 ` [GSoC][PATCH v2 0/2] " Junio C Hamano
2019-07-19 21:47 ` Junio C Hamano
2019-07-12 18:53 ` [GSoC][PATCH 1/2] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-07-15 18:04 ` Junio C Hamano
2019-07-12 18:53 ` [GSoC][PATCH 2/2] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-07-14 11:31 ` Rohit Ashiwal
2019-07-18 18:55 ` Rohit Ashiwal [this message]
2019-07-18 18:55 ` [GSoC][PATCH v2 1/1] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-07-19 21:33 ` Junio C Hamano
2019-07-23 19:59 ` Rohit Ashiwal
2019-07-23 20:57 ` Junio C Hamano
2019-07-22 10:00 ` Phillip Wood
2019-07-23 19:58 ` Rohit Ashiwal
2019-07-23 21:01 ` Elijah Newren
2019-07-24 11:14 ` Johannes Schindelin
2019-07-24 21:18 ` [GSoC][PATCH v3 0/1] " Rohit Ashiwal
2019-07-24 21:18 ` [GSoC][PATCH v3 1/1] " Rohit Ashiwal
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190718185514.20108-1-rohit.ashiwal265@gmail.com \
--to=rohit.ashiwal265@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=t.gummerer@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).