From: Jonathan Nieder <jrnieder@gmail.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH 12/18] revert: Save command-line options for continuing operation
Date: Wed, 27 Jul 2011 07:05:15 +0200 [thread overview]
Message-ID: <20110727050515.GH18470@elie> (raw)
In-Reply-To: <1311736755-24205-13-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra wrote:
> In the same spirit as ".git/sequencer/head" and ".git/sequencer/todo",
> introduce ".git/sequencer/opts" to persist the replay_opts structure
> for continuing after a conflict resolution. Use the gitconfig format
> for this file so that it looks like:
>
> [core]
> signoff = true
> record-origin = true
> mainline = 1
> strategy = recursive
> strategy-option = patience
> strategy-option = ours
Maybe "[options]" instead of "[core]" would be more self-explanatory.
If this is meant to be closely analagous to the gitconfig file, then
variable names should not contain dashes. It would be nice if some
day the config parser could learn to treat dashes as insignificant,
just like it already treats case distinctions as insignificant.
next prev parent reply other threads:[~2011-07-27 5:05 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-27 3:18 [PATCH 00/18] GSoC update: Sequencer for inclusion v3 Ramkumar Ramachandra
2011-07-27 3:18 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-07-27 3:18 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-07-27 3:39 ` Jonathan Nieder
2011-07-27 5:42 ` Jeff King
2011-07-28 15:40 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 03/18] revert: Simplify and inline add_message_to_msg Ramkumar Ramachandra
2011-07-27 4:18 ` Jonathan Nieder
2011-07-27 17:26 ` Ramkumar Ramachandra
2011-07-27 17:42 ` Jonathan Nieder
2011-07-27 17:49 ` Ramkumar Ramachandra
2011-07-27 17:51 ` Jonathan Nieder
2011-07-27 3:19 ` [PATCH 04/18] revert: Don't check lone argument in get_encoding Ramkumar Ramachandra
2011-07-27 4:32 ` Jonathan Nieder
2011-07-28 15:43 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 05/18] revert: Rename no_replay to record_origin Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 06/18] revert: Propogate errors upwards from do_pick_commit Ramkumar Ramachandra
2011-07-27 4:39 ` Jonathan Nieder
2011-07-27 9:47 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 07/18] revert: Eliminate global "commit" variable Ramkumar Ramachandra
2011-07-27 4:43 ` Jonathan Nieder
2011-07-27 8:59 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 08/18] revert: Introduce struct to keep command-line options Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 09/18] revert: Separate cmdline parsing from functional code Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 10/18] revert: Don't create invalid replay_opts in parse_args Ramkumar Ramachandra
2011-07-27 4:46 ` Jonathan Nieder
2011-07-31 12:31 ` Christian Couder
2011-08-01 17:37 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 11/18] revert: Save data for continuing after conflict resolution Ramkumar Ramachandra
2011-07-27 5:02 ` Jonathan Nieder
2011-07-27 10:19 ` Ramkumar Ramachandra
2011-07-27 15:56 ` Jonathan Nieder
2011-07-27 18:03 ` Ramkumar Ramachandra
2011-07-27 22:51 ` Junio C Hamano
2011-07-27 3:19 ` [PATCH 12/18] revert: Save command-line options for continuing operation Ramkumar Ramachandra
2011-07-27 5:05 ` Jonathan Nieder [this message]
2011-07-27 9:51 ` Ramkumar Ramachandra
2011-07-27 14:21 ` Jonathan Nieder
2011-07-27 15:49 ` Ramkumar Ramachandra
2011-07-27 22:51 ` Junio C Hamano
2011-07-27 3:19 ` [PATCH 13/18] revert: Make pick_commits functionally act on a commit list Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 14/18] revert: Introduce --reset to remove sequencer state Ramkumar Ramachandra
2011-07-27 5:11 ` Jonathan Nieder
2011-07-27 10:12 ` Ramkumar Ramachandra
2011-07-27 14:28 ` Jonathan Nieder
2011-07-27 14:35 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 15/18] reset: Make reset remove the " Ramkumar Ramachandra
2011-07-27 5:16 ` Jonathan Nieder
2011-07-28 15:42 ` Ramkumar Ramachandra
2011-07-28 15:59 ` Jonathan Nieder
2011-07-27 3:19 ` [PATCH 16/18] revert: Remove sequencer state when no commits are pending Ramkumar Ramachandra
2011-07-27 5:17 ` Jonathan Nieder
2011-07-27 9:42 ` Ramkumar Ramachandra
2011-07-27 14:10 ` Jonathan Nieder
2011-07-27 14:30 ` Ramkumar Ramachandra
2011-07-27 15:48 ` Jonathan Nieder
2011-07-27 15:52 ` Ramkumar Ramachandra
2011-07-28 16:16 ` Ramkumar Ramachandra
2011-07-29 19:16 ` Jonathan Nieder
2011-07-29 19:56 ` Ramkumar Ramachandra
2011-07-30 13:10 ` Jonathan Nieder
2011-07-30 14:43 ` Ramkumar Ramachandra
2011-07-30 14:48 ` Jonathan Nieder
2011-07-27 3:19 ` [PATCH 17/18] revert: Don't implictly stomp pending sequencer operation Ramkumar Ramachandra
2011-07-27 5:19 ` Jonathan Nieder
2011-07-27 9:59 ` Ramkumar Ramachandra
2011-07-27 14:33 ` Jonathan Nieder
2011-07-27 17:06 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 18/18] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-07-27 5:22 ` Jonathan Nieder
2011-07-27 9:36 ` Ramkumar Ramachandra
2011-07-27 15:42 ` Jonathan Nieder
2011-07-27 15:56 ` Ramkumar Ramachandra
2011-07-27 22:52 ` Junio C Hamano
2011-07-28 13:16 ` Ramkumar Ramachandra
2011-07-27 22:59 ` [PATCH 00/18] GSoC update: Sequencer for inclusion v3 Junio C Hamano
2011-07-28 16:26 ` Ramkumar Ramachandra
2011-07-28 16:32 ` Ramkumar Ramachandra
2011-07-28 16:39 ` Jonathan Nieder
-- strict thread matches above, loose matches on Subject: below --
2011-07-19 17:17 [GSoC update] Sequencer for inclusion v2 Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 12/18] revert: Save command-line options for continuing operation Ramkumar Ramachandra
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=20110727050515.GH18470@elie \
--to=jrnieder@gmail.com \
--cc=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).