From: Jay Soffian <jaysoffian@gmail•com>
To: git@vger•kernel.org
Cc: Jay Soffian <jaysoffian@gmail•com>,
jean-luc malet <jeanluc.malet@gmail•com>,
Junio C Hamano <gitster@pobox•com>
Subject: [PATCH 0/3] Re: how to have --no-ff be the default for all branch
Date: Fri, 6 Mar 2009 17:15:12 -0500 [thread overview]
Message-ID: <cover.1236377358.git.jaysoffian@gmail.com> (raw)
2009/3/6 jean-luc malet <jeanluc.malet@gmail•com>:
> I would like that it is the default for all branch and that I use --ff
> when I want to do fast forward merge
> I know that I can set it up for one branch
> git config add branch.master.mergeoption --no-ff
> but I want it to be the default no just for one branch but for all branch
> git config add branch.*.mergeoption --no-ff
> don't work....
This series should do it for you. It teaches merge to support
merge.options, which is the default for all merge operations.
Jay Soffian (3):
config: add git_config_option_string()
builtin-merge: refactor to use git_config_option_string
builtin-merge: add support for default merge options
Documentation/git-merge.txt | 11 +++-
builtin-merge.c | 24 +++----
cache.h | 2 +
config.c | 39 ++++++++++++
parse-options.c | 2 +
t/t7600-merge.sh | 143 ++++++++++++++++++++++++++++++++++++-------
6 files changed, 182 insertions(+), 39 deletions(-)
next reply other threads:[~2009-03-06 22:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-06 22:15 Jay Soffian [this message]
2009-03-06 22:15 ` [PATCH 1/3] config: add git_config_option_string() Jay Soffian
2009-03-06 22:15 ` [PATCH 2/3] builtin-merge: refactor to use git_config_option_string Jay Soffian
2009-03-06 22:15 ` [PATCH 3/3] builtin-merge: add support for default merge options Jay Soffian
2009-03-06 22:46 ` Junio C Hamano
2009-03-06 23:16 ` Jay Soffian
2009-03-07 0:44 ` [PATCH v2 " Jay Soffian
2009-03-07 0:58 ` [PATCH " Junio C Hamano
2009-03-07 1:56 ` Jay Soffian
2009-03-07 7:18 ` Junio C Hamano
2009-03-07 13:48 ` Jay Soffian
2009-03-07 19:31 ` jean-luc malet
2010-03-19 14:19 ` jean-luc malet
2010-03-19 14:54 ` Jay Soffian
2010-04-02 17:19 ` jean-luc malet
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=cover.1236377358.git.jaysoffian@gmail.com \
--to=jaysoffian@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jeanluc.malet@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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