From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>,
Jakub Narebski <jnareb@gmail.com>,
Paolo Bonzini <bonzini@gnu.org>,
Johannes Sixt <j.sixt@viscovery.net>,
Stephen Boyd <bebarino@gmail.com>,
Andreas Schwab <schwab@linux-m68k.org>,
Daniel Convissor <danielc@analysisandsolutions.com>
Subject: [PATCH v2 0/5] add "--keep" option to "git reset"
Date: Tue, 19 Jan 2010 05:25:56 +0100 [thread overview]
Message-ID: <20100119042404.4510.48855.chriscool@tuxfamily.org> (raw)
Changes since the previous series are the following:
- removed parts of the commit message that contrasted "--keep" with "--merge"
- improved wording in the documentation
- added a new patch to disallow "--keep" when there are unmerged entries
- added some tests for --keep in t7111-reset-table.sh
Christian Couder (5):
reset: add option "--keep" to "git reset"
reset: add test cases for "--keep" option
Documentation: reset: describe new "--keep" option
reset: disallow "reset --keep" outside a work tree
reset: disallow using --keep when there are unmerged entries
Documentation/git-reset.txt | 48 +++++++++++++++++-
builtin-reset.c | 46 ++++++++++++++---
t/t7103-reset-bare.sh | 25 ++++++---
t/t7110-reset-merge.sh | 116 ++++++++++++++++++++++++++++++++++++++++++-
t/t7111-reset-table.sh | 8 +++
5 files changed, 223 insertions(+), 20 deletions(-)
next reply other threads:[~2010-01-19 4:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-19 4:25 Christian Couder [this message]
2010-01-19 4:25 ` [PATCH v2 1/5] reset: add option "--keep" to "git reset" Christian Couder
2010-01-19 5:50 ` Junio C Hamano
2010-01-23 4:18 ` Christian Couder
2010-01-19 4:25 ` [PATCH v2 2/5] reset: add test cases for "--keep" option Christian Couder
2010-01-19 4:25 ` [PATCH v2 3/5] Documentation: reset: describe new " Christian Couder
2010-01-19 4:26 ` [PATCH v2 4/5] reset: disallow "reset --keep" outside a work tree Christian Couder
2010-01-19 4:26 ` [PATCH v2 5/5] reset: disallow using --keep when there are unmerged entries Christian Couder
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=20100119042404.4510.48855.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=bebarino@gmail.com \
--cc=bonzini@gnu.org \
--cc=danielc@analysisandsolutions.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=jnareb@gmail.com \
--cc=s-beyer@gmx.net \
--cc=schwab@linux-m68k.org \
--cc=torvalds@linux-foundation.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).