git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Israel, Daniel M" <dmi1@lanl.gov>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Writing merge strategy?
Date: Fri, 25 Jan 2019 00:55:52 +0000	[thread overview]
Message-ID: <244FE6CE-C045-4EC9-8C3F-8D16CF4D09EB@lanl.gov> (raw)

I need a custom merge strategy (not driver) for a tool I’m writing, and I’m wondering:

1. Is there documentation for the API anywhere?

2. Does git-merge actually do any magic, or could I just run the script that implements my merge directly?  In other words, is there really any difference between a merge strategy and a script that creates the tree I want and then commits it using git-commit-tree with multiple -p arguments.

—
Daniel M. Israel, Ph. D.
Physics Verification Lead
XCP-4: Methods & Algorithms
Mailstop F644
Los Alamos National Laboratory
505 665 5664


             reply	other threads:[~2019-01-25  0:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-25  0:55 Israel, Daniel M [this message]
2019-01-25 21:33 ` Writing merge strategy? Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=244FE6CE-C045-4EC9-8C3F-8D16CF4D09EB@lanl.gov \
    --to=dmi1@lanl.gov \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).