git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Caleb Cushing <xenoterracide@gmail.com>
To: git@vger.kernel.org
Subject: auto commit merge using the default merge message
Date: Thu, 23 Apr 2009 03:46:05 -0400	[thread overview]
Message-ID: <81bfc67a0904230046j48ed06b7s5693406332ee52dc@mail.gmail.com> (raw)

so I do the same merge all the time... sorta, I'm not sure rerere
would actually work because the file is different each time... I just
have to delete it each time. and I want to automate the process.
checkout merge rm commmit, problem is commit brings and editor up, I
want to commit with the 'auto inserted merge message' that is
generated, without seeing the editor, how do I do this?

-- 
Caleb Cushing

http://xenoterracide.blogspot.com

             reply	other threads:[~2009-04-23  7:48 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-23  7:46 Caleb Cushing [this message]
2009-04-23  7:57 ` auto commit merge using the default merge message Alex Riesen
2009-04-23  8:25   ` Michael J Gruber
2009-04-23  8:32     ` Junio C Hamano
2009-04-23  9:07       ` Michael J Gruber
2009-04-23 16:19         ` Brian Gernhardt
2009-04-24  1:31       ` Caleb Cushing
2009-04-24 14:06         ` Jeff King
2009-04-24 17:50           ` Caleb Cushing
2009-04-24 17:55             ` Jeff King

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

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

  git send-email \
    --in-reply-to=81bfc67a0904230046j48ed06b7s5693406332ee52dc@mail.gmail.com \
    --to=xenoterracide@gmail.com \
    --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.
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 NNTP newsgroup(s).