git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Paul Fredrickson" <paul.fredrickson@gmail.com>
To: git@vger.kernel.org
Cc: joerg@alea.gnuu.de, junio@pobox.com, Johannes.Schindelin@gmx.de
Subject: Re: [PATCH/RFC 01/10] Teach rebase interactive the mark command
Date: Sun, 13 Apr 2008 13:51:50 -0700	[thread overview]
Message-ID: <69a88a530804131351n7d9f8188vf2bbb0174ade3ca0@mail.gmail.com> (raw)

> Jrg Sommer <joerg@alea.gnuu.de> wrote:
> > > Wouldn't
> > >
> > > pick 5cc8f37 (init: show "Reinit" message even in ...)
> > > mark 1
> > > pick 18d077c (quiltimport: fix misquoting of parse...)
> > > mark 2
> > > reset 1
> >
> > "reset 18d077c~2" or "reset some-tag" or "reset my-branch~12"
> >
> >         merge #2
> > >
> > > be easier for people?
> >
> > I don't know. Using the special sign everywhere a mark is used looks more
> > consistent to me. The only case where it might be omitted is the mark
> > command, because it only uses marks.
>
> Why not use the mark syntax that fast-import uses?  In fast-import
> we use ":n" anytime we need to refer to a mark, e.g. ":1" or ":5".
> Its the same idea.  We already have a language for it.  Heck, the
> commands above are bordering on a language not too far from the
> one that fast-import accepts.  :-)

I like the idea of adding marks to an interactive rebase in general, but instead
of adding a separate command, what if rebase *automatically* marked all the
commits in the session:

    1: pick 5cc8f37 (init: show "Reinit" message even in ...)
    2: pick 18d007c (quiltimport: fix misquoting of parse ...)
    reset 1
    merge 2

or "reset :1" and "merge :2".  Neither notation bothers me for marks.

--Paul

             reply	other threads:[~2008-04-13 20:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-13 20:51 Paul Fredrickson [this message]
2008-04-14  9:27 ` [PATCH/RFC 01/10] Teach rebase interactive the mark command Jörg Sommer
2008-04-14 14:10 ` Johannes Schindelin
2008-04-15  0:11   ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2008-03-24 18:35 [PATCH 4/4] git-rebase -i: New option to support rebase with merges Junio C Hamano
2008-04-09 23:58 ` Teach rebase interactive more commands to do better preserve merges Jörg Sommer
2008-04-09 23:58   ` [PATCH/RFC 01/10] Teach rebase interactive the mark command Jörg Sommer
2008-04-10  9:33     ` Mike Ralphson
2008-04-12 10:17       ` Jörg Sommer
2008-04-11 23:48     ` Junio C Hamano
2008-04-12 10:11       ` Jörg Sommer
2008-04-13  3:56         ` Shawn O. Pearce
2008-04-13 16:50           ` Jörg Sommer
2008-04-14  6:24             ` Shawn O. Pearce
2008-04-14  6:54               ` Junio C Hamano
2008-04-14 10:06               ` Jörg Sommer

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=69a88a530804131351n7d9f8188vf2bbb0174ade3ca0@mail.gmail.com \
    --to=paul.fredrickson@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=joerg@alea.gnuu.de \
    --cc=junio@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).