From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Tom Clarke <tom@u2i.com>
Cc: git@vger.kernel.org
Subject: Re: Add --rebase option to git-pull?
Date: Thu, 30 Aug 2007 14:16:34 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0708301415150.28586@racer.site> (raw)
In-Reply-To: <550f9510708300540u13c77201oe7cbe599c6773364@mail.gmail.com>
Hi,
On Thu, 30 Aug 2007, Tom Clarke wrote:
> I'm in the process of setting up a git environment with a number of
> shared branches. To avoid putting unnecessary merges into the trunk,
> we'd like to normally use rebase when updating private branches. I
> wondered if it would be possible to automatically determine the correct
> remote branch to rebase against.
>
> The most logical place to do this seemed to be in git-pull, so I
> experimented with adding a '--rebase' option, per the (rough) diff
> below.
In my TODO, there is "add the 'rebase' strategy". It is definitely
something post-1.5.3, so I do not look into it. But the most logical
place for me would be to have a strategy 'rebase'. IOW a
git-merge-rebase.sh.
Ciao,
Dscho
next prev parent reply other threads:[~2007-08-30 13:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-30 12:40 Add --rebase option to git-pull? Tom Clarke
2007-08-30 13:07 ` Andreas Ericsson
2007-08-30 13:17 ` Tom Clarke
2007-08-30 13:16 ` Johannes Schindelin [this message]
2007-08-30 15:10 ` Tom Clarke
2007-08-30 15:23 ` Johannes Schindelin
2007-08-30 15:26 ` Tom Clarke
2007-08-30 16:54 ` Jakub Narebski
2007-08-30 20:22 ` Alex Riesen
2007-08-30 20:36 ` Tom Clarke
2007-08-30 20:44 ` Tom Clarke
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=Pine.LNX.4.64.0708301415150.28586@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=tom@u2i.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).