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

Re: [PATCH] Use git-update-ref in scripts.

From
Junio C Hamano <junkio@cox.net>
Date
Sep 28, 2005, 16:56 UTC
Message-ID
<7vek79w2ps.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.58.0509280819000.3308@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
> git-resolve might want to verify the old head. On the other hand, it looks 
> like it's being phased out, so maybe nobody cares?

It was my mistake -- git-merge does it, and I should do the same in git-resolve. Thanks for pointing it out.

Have you had a chance to look at the git-merge change to remove the stupid clean-tree requirements? I have been planning to inflict the 'use git-merge instead of git-resolve' change on you sometime soonish (like today ;-). Having said that, I myself would vote against phasing out 'git-resolve' -- being able to say 'git resolve master hold fast' to fast forward the master head to topic branch head of 'hold' (my topic branches are often rebased to allow this) is quite useful.

I have one unrelated request.

Could I have a copy of .git/{branches,remotes,refs}/* from the primary repository you do your kernel work please?

Previous: Linus TorvaldsNext: Linus Torvalds
Message 6 of 19 in “Add "git-update-ref" to update the HEAD (or other) ref”
  1. Linus TorvaldsSep 25, 2005
  2. Linus TorvaldsSep 25, 2005
  3. Junio C HamanoSep 25, 2005
  4. Use git-update-ref in scripts.Junio C Hamano, Sep 28, 2005
  5. Linus TorvaldsSep 28, 2005
  6. Junio C HamanoSep 28, 2005
  7. Linus TorvaldsSep 28, 2005
  8. Junio C HamanoSep 28, 2005
  9. Linus TorvaldsSep 28, 2005
  10. Junio C HamanoSep 28, 2005
  11. Linus TorvaldsSep 29, 2005
  12. Junio C HamanoSep 28, 2005
  13. Junio C HamanoSep 28, 2005
  14. Fredrik KuivinenSep 28, 2005
  15. Linus TorvaldsSep 29, 2005
  16. Junio C HamanoSep 25, 2005
  17. Linus TorvaldsSep 26, 2005
  18. Junio C HamanoSep 26, 2005
  19. Linus TorvaldsSep 26, 2005

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.