From: Jing Xue <jingxue@digizenstudio.com>
To: git@vger.kernel.org
Subject: Re: how do you "force a pull"?
Date: Mon, 27 Aug 2007 01:26:31 -0400 [thread overview]
Message-ID: <20070827052631.GA3580@falcon.digizenstudio.com> (raw)
In-Reply-To: <m34pimdspt.fsf@pc7.dolda2000.com>
On Sun, Aug 26, 2007 at 09:02:54PM +0200, Fredrik Tolf wrote:
>
> This is probably not as good an answer as David Watson's suggestion,
> but if what you want is to commit your current code while still having
> your savepoint commit in the history, shouldn't you be able to commit
> your current code and then use git-rebase to rebase it onto the
> savepoint commit?
Yep, I tried and it works too. A bit more verbose than a hard reset -
involved some manual merging in my case, had to update-index and then
--continue the rebase. But then I think this approach is semantically
different and probably safer than a hard reset in some cases.
All this is interesting and good to know. Thanks, Fredrik!
--
Jing Xue
prev parent reply other threads:[~2007-08-27 5:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-25 11:19 how do you "force a pull"? Jing Xue
2007-08-25 11:31 ` Dan Chokola
2007-08-25 11:37 ` David Watson
2007-08-25 11:53 ` Jing Xue
2007-08-25 13:19 ` Randal L. Schwartz
2007-08-26 19:02 ` Fredrik Tolf
2007-08-27 5:26 ` Jing Xue [this message]
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=20070827052631.GA3580@falcon.digizenstudio.com \
--to=jingxue@digizenstudio.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.