git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Yann Dirson <dirson@bertin.fr>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
	Yann Dirson <ydirson@free.fr>, Kevin Ballard <kevin@sb.org>,
	Junio C Hamano <gitster@pobox.com>,
	Eric Raible <raible@nextest.com>,
	git@vger.kernel.org
Subject: Re: [PATCH] git-rebase--interactive.sh: Add new command "shell"
Date: Wed, 10 Nov 2010 17:00:30 +0100	[thread overview]
Message-ID: <vpqtyjpw4m9.fsf@bauges.imag.fr> (raw)
In-Reply-To: <20101110084343.0c519764@chalon.bertin.fr> (Yann Dirson's message of "Wed\, 10 Nov 2010 08\:43\:43 +0100")

Yann Dirson <dirson@bertin.fr> writes:

> BTW, about people feeling at ease with "rebase -i", I often feel not
> quite comfortable to explain why to reorder commits you have to use
> this "rebase" feature

I feel a bit the same. Actually, I don't think I ever used "rebase -i"
to actually perform a rebase. I usually "git pull --rebase" to rebase,
and "rebase -i" to rewrite history without changing the origin of the
branch.

> alias.reroll = rebase -i $(git merge-base HEAD @{upstream})

Mercurial calls this "histedit" for example.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

  reply	other threads:[~2010-11-10 16:03 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-04  5:17 [PATCH] git-rebase--interactive.sh: Add new command "shell" Kevin Ballard
2010-11-04  5:22 ` Kevin Ballard
2010-11-04  8:42 ` Matthieu Moy
2010-11-04  8:53   ` Kevin Ballard
2010-11-04  9:23     ` Ævar Arnfjörð Bjarmason
2010-11-04  9:25       ` Kevin Ballard
2010-11-04  9:27         ` Ævar Arnfjörð Bjarmason
2010-11-04 10:24     ` Johannes Sixt
2010-11-04  9:36 ` Erik Faye-Lund
2010-11-04  9:43   ` Kevin Ballard
2010-11-04 10:25     ` Yann Dirson
2010-11-04 10:40       ` Erik Faye-Lund
2010-11-04 17:04       ` Eric Raible
2010-11-04 17:34         ` Matthieu Moy
2010-11-04 17:43           ` Eric Raible
2010-11-04 18:10           ` Jonathan Nieder
2010-11-04 20:53             ` Yann Dirson
2010-11-04 21:05               ` Eric Raible
2010-11-04 22:01                 ` [PATCHv2] git-rebase--interactive.sh: extend "edit" command to be more useful Kevin Ballard
2010-11-04 21:33               ` [PATCH] git-rebase--interactive.sh: Add new command "shell" Kevin Ballard
2010-11-05  7:33               ` Johannes Sixt
2010-11-05  8:39                 ` Kevin Ballard
2010-11-08 18:31               ` Junio C Hamano
2010-11-08 21:49                 ` Kevin Ballard
2010-11-08 22:29                   ` Yann Dirson
2010-11-10  1:42                     ` Jonathan Nieder
2010-11-10  1:46                       ` Kevin Ballard
2010-11-10  1:56                         ` Jonathan Nieder
2010-11-10  7:43                       ` Yann Dirson
2010-11-10 16:00                         ` Matthieu Moy [this message]
2010-11-10  1:53                 ` Jonathan Nieder
2010-11-10  2:14                   ` Kevin Ballard
2010-11-24 20:19                   ` [PATCHv3] git-rebase--interactive.sh: extend "edit" command to be more useful Kevin Ballard
2010-12-03  8:06                     ` Jonathan Nieder
2010-12-03  8:16                       ` Kevin Ballard
2010-12-03  8:55                         ` Jonathan Nieder
2010-12-03  9:55                       ` Johannes Sixt
2010-12-03 10:00                         ` Jonathan Nieder
2010-12-03 10:14                           ` Kevin Ballard

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=vpqtyjpw4m9.fsf@bauges.imag.fr \
    --to=matthieu.moy@grenoble-inp.fr \
    --cc=dirson@bertin.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=kevin@sb.org \
    --cc=raible@nextest.com \
    --cc=ydirson@free.fr \
    /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).