From: Eric Sunshine <sunshine@sunshineco.com>
To: git@vger.kernel.org
Cc: "Harri Mehtälä" <harri.mehtala@finago.com>,
"Duy Nguyen" <pclouds@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: [PATCH 0/2] enhance "git restore --worktree --staged" behavior
Date: Fri, 1 May 2020 04:27:44 -0400 [thread overview]
Message-ID: <20200501082746.23943-1-sunshine@sunshineco.com> (raw)
This series addresses a shortcoming or two when git-restore's --worktree
and --staged options are combined. The first patch tightens the
implementation to match the documentation. The second patch loosens the
documented restriction by adding a bit of DWIMing to make it more
convenient to combine the two options.
Although the second patch effectively throws away the changes of the
first patch, I kept them separate in case someone comes up with a good
objection to the new DWIMing (which escaped me), in which case the first
patch can be kept and the second thrown away.
Eric Sunshine (2):
restore: require --source when combining --worktree and --staged
restore: default to HEAD when combining --worktree and --staged
Documentation/git-restore.txt | 13 +++++++------
builtin/checkout.c | 6 +++---
t/t2070-restore.sh | 11 +++++++++++
3 files changed, 21 insertions(+), 9 deletions(-)
--
2.26.2.526.g744177e7f7
next reply other threads:[~2020-05-01 8:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-01 8:27 Eric Sunshine [this message]
2020-05-01 8:27 ` [PATCH 1/2] restore: require --source when combining --worktree and --staged Eric Sunshine
2020-05-01 8:49 ` Eric Sunshine
2020-05-01 22:16 ` Taylor Blau
2020-05-01 8:27 ` [PATCH 2/2] restore: default to HEAD " Eric Sunshine
2020-05-01 15:32 ` Junio C Hamano
2020-05-05 3:53 ` Eric Sunshine
2020-05-01 22:19 ` Taylor Blau
2020-05-05 4:00 ` Eric Sunshine
2020-05-05 4:44 ` Taylor Blau
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200501082746.23943-1-sunshine@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=harri.mehtala@finago.com \
--cc=pclouds@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).