git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dun Peal <dunpealer@gmail.com>
To: git@vger.kernel.org
Subject: Re: Is there a way to add a default `--squash` flag for all merges into a head?
Date: Thu, 10 Mar 2011 11:38:21 -0800 (PST)	[thread overview]
Message-ID: <5a2ac540-481e-49e6-9e2e-eb410ba483e0@w9g2000prg.googlegroups.com> (raw)
In-Reply-To: <AANLkTinmdQ6r8cBDsFjXR+KLGeZR1-yeu7h9R=X0+1PG@mail.gmail.com>

On Mar 8, 1:29 am, Jay Soffian <jaysoff...@gmail.com> wrote:
> Try:
>
>   $ git config branch.<name>.mergeoptions --squash

Thanks, that works great and answers our need. Thanks to Junio as well
for the thorough discussion of our workflow.

.D

      reply	other threads:[~2011-03-10 19:38 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-07 19:28 Is there a way to add a default `--squash` flag for all merges into a head? Dun Peal
2011-03-07 21:10 ` Andreas Schwab
2011-03-07 21:48   ` Dun Peal
2011-03-08 19:28     ` Junio C Hamano
2011-03-09 18:38       ` Dun Peal
2011-03-09 19:27         ` Junio C Hamano
2011-03-09 20:11           ` Dun Peal
2011-03-08  7:29 ` Jay Soffian
2011-03-10 19:38   ` Dun Peal [this message]

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=5a2ac540-481e-49e6-9e2e-eb410ba483e0@w9g2000prg.googlegroups.com \
    --to=dunpealer@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).