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

Re: modifying the commits before push

From
Andreas Schwab <schwab@linux-m68k.org>
Date
Jan 18, 2012, 22:01 UTC
Message-ID
<m262g8r7p8.fsf@igel.home>
In-Reply-To
<87sjjc3cpj.fsf@gnu.org>
Sam Steingold <sds@gnu.org> writes:
Show 5 quoted lines
> alas, I could not push because the remote tree was modified in the
> meantime, I pulled and now:
>
> # On branch master
> # Your branch is ahead of 'origin/master' by 23 commits.
What exactly did you do to get the additional 19 commits?
> is there a way for me to get back my original 4 patches, reset my tree
> (maybe by rm-rf+clone) and then re-apply them?
You can find them in the reflog (git log -g).
Andreas.
-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Previous: Sam Steingold
Message 4 of 4 in “modifying the commits before push”
  1. Sam SteingoldJan 18, 2012
  2. Dirk SüsserottJan 18, 2012
  3. Sam SteingoldJan 18, 2012
  4. Andreas SchwabJan 18, 2012

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.