git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: how do you "force a pull"?

From
JXJing Xue <jingxue@digizenstudio.com>
Date
Aug 27, 2007, 05:26 UTC
Message-ID
<20070827052631.GA3580@falcon.digizenstudio.com>
In-Reply-To
<m34pimdspt.fsf@pc7.dolda2000.com>
On Sun, Aug 26, 2007 at 09:02:54PM +0200, Fredrik Tolf wrote:
Show 6 quoted lines
> 
> 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
Previous: Fredrik Tolf
Message 7 of 7 in “how do you "force a pull"?”
  1. Jing XueAug 25, 2007
  2. Dan ChokolaAug 25, 2007
  3. David WatsonAug 25, 2007
  4. Jing XueAug 25, 2007
  5. Randal L. SchwartzAug 25, 2007
  6. Fredrik TolfAug 26, 2007
  7. Jing XueAug 27, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.