git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCHv2 0/2] Make git branch -f forceful
Date: Mon,  8 Dec 2014 17:28:43 +0100	[thread overview]
Message-ID: <cover.1418055912.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <xmqqbnniq8k8.fsf@gitster.dls.corp.google.com>

For many git commands, '-f/--force' is a way to force actions which
would otherwise error out. Way more than once, I've been trying this
with 'git branch -d' and 'git branch -m'...

I've had these two patches sitting in my tree for 3 years now it seems.
Here's a rebase.

In v2 I rename force_create to force and spell out the "-f" behaviour
for other options in the commit message.

Michael J Gruber (2):
  t3200-branch: test -M
  branch: allow -f with -m and -d

 builtin/branch.c  | 13 +++++++++----
 t/t3200-branch.sh | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

-- 
2.2.0.345.g7041aac

  reply	other threads:[~2014-12-08 16:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-04 13:26 [RFC/PATCH 0/2] Make git branch -f forceful Michael J Gruber
2014-12-04 13:26 ` [RFC/PATCH 1/2] t3200-branch: test -M Michael J Gruber
2014-12-04 13:26 ` [RFC/PATCH 2/2] branch: allow -f with -m and -d Michael J Gruber
2014-12-04 19:13   ` Junio C Hamano
2014-12-05 10:57     ` Michael J Gruber
2014-12-05 18:02       ` Junio C Hamano
2014-12-08 16:28         ` Michael J Gruber [this message]
2014-12-08 16:28           ` [PATCHv2 1/2] t3200-branch: test -M Michael J Gruber
2014-12-08 16:28           ` [PATCHv2 2/2] branch: allow -f with -m and -d Michael J Gruber

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.1418055912.git.git@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).