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

Re: [StGit PATCH 1/4] Add mergetool support to the classic StGit infrastructure

From
Karl Hasselström <kha@treskal.com>
Date
Mar 17, 2009, 15:29 UTC
Message-ID
<20090317152912.GB10001@diana.vm.bytemark.co.uk>
In-Reply-To
<20090317110853.27748.70157.stgit@pc1117.cambridge.arm.com>
On 2009-03-17 11:08:53 +0000, Catalin Marinas wrote:
Show 8 quoted lines
> Since Git already has a tool for interactively solving conflicts
> which is highly customisable, there is no need to duplicate this
> feature via the i3merge and i2merge configuration options. The
> user-visible change is that now mergetool is invoked rather than the
> previously customised interactive merging tool.
>
> The stgit.keeporig option is no longer available to be more
> consistent with the Git behaviour.
Acked-by: Karl Hasselström <kha@treskal.com>
-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Previous: Catalin MarinasNext: Catalin Marinas
Message 3 of 9 in “Reposting udpated patches”
  1. 0/4 Reposting udpated patchesCatalin Marinas, Mar 17, 2009
  2. 1/4 Add mergetool support to the classic StGit infrastructureCatalin Marinas, Mar 17, 2009
  3. Karl HasselströmMar 17, 2009
  4. 2/4 Add automatic git-mergetool invocation to the new infrastructureCatalin Marinas, Mar 17, 2009
  5. Karl HasselströmMar 17, 2009
  6. 3/4 Convert "float" to the lib infrastructureCatalin Marinas, Mar 17, 2009
  7. Karl HasselströmMar 17, 2009
  8. 4/4 Use a default "hidden" argument in StackTransaction.reorder_patchesCatalin Marinas, Mar 17, 2009
  9. Karl HasselströmMar 17, 2009

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.