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

Re: Avoiding uninteresting merges in Cairo

From
Junio C Hamano <junkio@cox.net>
Date
Dec 15, 2006, 21:03 UTC
Message-ID
<7vvekcub1i.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<87tzzx4zm7.wl%cworth@cworth.org>
Carl Worth <cworth@cworth.org> writes:
Show 11 quoted lines
> On Thu, 14 Dec 2006 21:06:29 -0500, Shawn Pearce wrote:
>> ...
>> Cairo has seriously been using `reset --hard HEAD^` as part of its
>> workflow since April?
> ...
> Also, I don't actually need this. I don't use the "reset --hard"
> workflow suggested in the mail above. I always obtain remote changes
> with "git fetch" and then examine things locally and decide to either
> merge (or fast forward) with "git pull", (though maybe I'll start
> using "git merge" now), or else to use "git rebase" to avoid the noisy
> merge commits.

I wish I have more time to keep track of "recommended workflows" that projects using git give to its developers.

I think what you recommend makes quite a lot of sense, for very centralized setting, and would leave much more usable history than the simple-minded way cvs-migration suggests.

Previous: Shawn Pearce
Message 8 of 8 in “Avoiding uninteresting merges in Cairo”
  1. Shawn PearceDec 15, 2006
  2. Carl WorthDec 15, 2006
  3. Shawn PearceDec 15, 2006
  4. Carl WorthDec 15, 2006
  5. Shawn PearceDec 15, 2006
  6. Jakub NarebskiDec 15, 2006
  7. Shawn PearceDec 15, 2006
  8. Junio C HamanoDec 15, 2006

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.