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

Re: git/lib and git/git-gui/lib merge mis-hap?

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 1, 2008, 22:46 UTC
Message-ID
<7vljw33vz5.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20081101202201.GA15463@spearce.org>
"Shawn O. Pearce" <spearce@spearce.org> writes:
Show 13 quoted lines
> Andreas Ericsson <ae@op5.se> wrote:
>> Settling down to get some libgit2 hacking done (adding build-rules
>> to git.git), I noticed that there's a file in git.git called
>> lib/remote_add.tcl, which looks as if it belongs in git-gui/lib.
>>
>> I don't know how this happened, but since I assume it's subtree
>> merged (thus requiring more work to correct than a simple patch),
>> it would be nifty if it could get corrected so as to make space
>> for the up-and-coming git library :-)
>
> That was a bad merge of git-gui on my part.  I thought it was fixed.
> It only happened in next, and was there only for a day before
> someone pointed it out to me, and I fixed it in the tree.

You seem to have further changes to the master branch of git-gui. Would it be a good time to pull for me? The same question goes to maint as well.

Previous: Shawn O. PearceNext: Shawn O. Pearce
Message 3 of 5 in “git/lib and git/git-gui/lib merge mis-hap?”
  1. Andreas EricssonNov 1, 2008
  2. Shawn O. PearceNov 1, 2008
  3. Junio C HamanoNov 1, 2008
  4. Shawn O. PearceNov 1, 2008
  5. Andreas EricssonNov 3, 2008

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.