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

Re: git: avoiding merges, rebasing

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 9, 2007, 10:43 UTC
Message-ID
<Pine.LNX.4.64.0710091141440.4174@racer.site>
In-Reply-To
<07BCEF3E-90DE-4BB7-8A8C-F03D12293B5F@lrde.epita.fr>
Hi,
On Mon, 8 Oct 2007, Benoit SIGOURE wrote:
> [as usual, I forgot the attachment...]
Two comments:
- by not inlining you made it hard to review your script.  Therefore I 
  will not do it.
- Try to avoid naming the script git-merge-*; these scripts/programs are 
  merge _strategies_, not merge _drivers_ (and yes, we already have two 
  programs violating this rule -- merge-base and merge-file -- but that 
  does not mean that you are free to add to the pile).

Ciao, Dscho

Previous: Benoit SIGOURENext: Benoit SIGOURE
Message 11 of 15 in “Re: git: avoiding merges, rebasing”
  1. Eric BlakeOct 2, 2007
  2. making "git stash" safer to useBruno Haible, Oct 3, 2007
  3. Junio C HamanoOct 3, 2007
  4. Joachim B HagaOct 4, 2007
  5. David KastrupOct 4, 2007
  6. stash clear, was Re: git: avoiding merges, rebasingJohannes Schindelin, Oct 19, 2007
  7. Miles BaderOct 23, 2007
  8. Bruno HaibleOct 3, 2007
  9. Benoit SIGOUREOct 8, 2007
  10. Benoit SIGOUREOct 8, 2007
  11. Johannes SchindelinOct 9, 2007
  12. Benoit SIGOUREOct 9, 2007
  13. Bruno HaibleOct 9, 2007
  14. GNU-style ChangeLog merge driver for Git (was: Re: git: avoiding merges, rebasing)Benoit SIGOURE, Oct 9, 2007
  15. Bruno HaibleOct 9, 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.