From: Phil Hord <phil.hord@gmail.com>
To: Philippe Vaucher <philippe.vaucher@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Christian Couder <chriscool@tuxfamily.org>
Subject: Re: Proposal: create meaningful aliases for git reset's hard/soft/mixed
Date: Thu, 1 Dec 2011 16:23:57 -0500 [thread overview]
Message-ID: <CABURp0rtCUbJXLHtXv_1g6GRKL3mX-T+3vN1=QO4CUibqXdEMg@mail.gmail.com> (raw)
In-Reply-To: <CAGK7Mr5nQoubAw11KDj4WKwQnXrfgteKbMj2=AR-HhsGKi52wQ@mail.gmail.com>
On Wed, Nov 23, 2011 at 6:00 PM, Philippe Vaucher
<philippe.vaucher@gmail.com> wrote:
>> In any case, I think your proposal makes it even worse than the current
>> state, and you should aim higher.
>
> Why worse? I'd understand if you said it's doesn't improve it enough
> for it to be worth the change tho.
I think that's what "you should aim higher" means.
> Anyway, my proposal was to get a discussion going, and I'm all for
> aiming higher if there's a way. What do you propose instead? You
> seemed to imply we'd remove --soft and --merge, and make --keep as an
> option for --hard but named differently, something like
> --keep-changes. Maybe I didn't fully understand.
I think there are too many scripts dependent on these switches to
remove them. But I love the direction you're going in.
Aim higher.
> Mathieu even suggested that it'd have the behavior of --keep by
> default, and that you have to add --force to get today's --hard
> behavior, which sounds like a good idea to me (avoid destructive
> behavior by default).
Think outside the "reset" command. Like this:
>From the "most popular" comment on http://progit.org/2011/07/11/reset.html:
> I remember them as:
> --soft -> git uncommit
> --mixed -> git unadd
> --hard -> git undo
I don't particular like these names, but conceptually they are helpful.
What other commands can we embellish or create to replace the overload
git-reset functionality?
How about:
--soft: git checkout -B <commit>
--mixed: git reset -- <paths>
--hard: git checkout --clean
Phil
next prev parent reply other threads:[~2011-12-01 21:24 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-23 8:28 Proposal: create meaningful aliases for git reset's hard/soft/mixed Philippe Vaucher
2011-11-23 8:49 ` Matthieu Moy
2011-11-23 11:32 ` Philippe Vaucher
2012-12-18 6:24 ` Martin von Zweigbergk
2011-11-23 12:02 ` Nguyen Thai Ngoc Duy
2011-11-23 18:51 ` Junio C Hamano
2011-11-23 23:00 ` Philippe Vaucher
2011-12-01 21:23 ` Phil Hord [this message]
2011-12-02 7:26 ` Thomas Rast
2011-12-02 7:45 ` Miles Bader
2011-12-02 15:28 ` Phil Hord
2011-12-02 14:27 ` Philippe Vaucher
2011-12-02 15:38 ` Phil Hord
2011-12-06 7:34 ` Philippe Vaucher
2012-10-03 16:23 ` Phil Hord
2012-10-03 18:41 ` Junio C Hamano
2012-10-03 19:03 ` Junio C Hamano
2012-12-15 18:57 ` Jan Engelhardt
2011-12-01 21:02 ` Phil Hord
2012-12-18 6:34 ` Martin von Zweigbergk
2012-12-18 15:22 ` Junio C Hamano
2012-12-18 16:30 ` Jeff King
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='CABURp0rtCUbJXLHtXv_1g6GRKL3mX-T+3vN1=QO4CUibqXdEMg@mail.gmail.com' \
--to=phil.hord@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philippe.vaucher@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).