From: Alex Riesen <raa.lkml@gmail.com>
To: Caleb Cushing <xenoterracide@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: auto commit merge using the default merge message
Date: Thu, 23 Apr 2009 09:57:18 +0200 [thread overview]
Message-ID: <81b0412b0904230057k1653d039vfc3962e6affda584@mail.gmail.com> (raw)
In-Reply-To: <81bfc67a0904230046j48ed06b7s5693406332ee52dc@mail.gmail.com>
2009/4/23 Caleb Cushing <xenoterracide@gmail.com>:
> 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?
See git commit -C <commit-with-fitting-description>,
git commit -F <message-file> and git commit -m "message text".
next prev parent reply other threads:[~2009-04-23 8:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-23 7:46 auto commit merge using the default merge message Caleb Cushing
2009-04-23 7:57 ` Alex Riesen [this message]
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=81b0412b0904230057k1653d039vfc3962e6affda584@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=xenoterracide@gmail.com \
/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).