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

Re: git pull suggestion

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Apr 11, 2010, 16:33 UTC
Message-ID
<vpq4ojit0dp.fsf@bauges.imag.fr>
In-Reply-To
<7vaataphi7.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> git does _not_ implement a handy Porcelain to do this, but we could script
> it like this (I am only illustrating that it can be done, but I am leaving
> the reason why git chooses not to to a later part of this message).
Actually, another way to do this is

git commit -a git rebase origin/where-you-want-to-merge-from git reset HEAD^

That would not necessarily be a good way to implement a command, but I often use variants of this interactively.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Junio C HamanoNext: Aghiles
Message 12 of 15 in “git pull suggestion”
  1. AghilesApr 7, 2010
  2. Thomas RastApr 8, 2010
  3. AghilesApr 8, 2010
  4. Nicolas SebrechtApr 8, 2010
  5. AghilesApr 9, 2010
  6. Jeff KingApr 9, 2010
  7. AghilesApr 9, 2010
  8. Jeff KingApr 10, 2010
  9. Junio C HamanoApr 10, 2010
  10. AghilesApr 11, 2010
  11. Junio C HamanoApr 11, 2010
  12. Matthieu MoyApr 11, 2010
  13. AghilesApr 12, 2010
  14. Junio C HamanoApr 12, 2010
  15. AghilesApr 9, 2010

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.