From: Philippe Vaucher <philippe.vaucher@gmail.com>
To: Phil Hord <phil.hord@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: Fri, 2 Dec 2011 15:27:13 +0100 [thread overview]
Message-ID: <CAGK7Mr7zdstbm7QsrYq9a6m9ui_r8Ak8XtyWADLQ0n-mXiov4w@mail.gmail.com> (raw)
In-Reply-To: <CABURp0rtCUbJXLHtXv_1g6GRKL3mX-T+3vN1=QO4CUibqXdEMg@mail.gmail.com>
> > 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.
Yes, but my question was why was the proposal _worse_ in his mind.
Anyway, it's not really important, probably something he typed in a
hurry.
> How about:
> --soft: git checkout -B <commit>
> --mixed: git reset -- <paths>
> --hard: git checkout --clean
I like the idea... but as other pointed out those are not equivalent.
Maybe we'd start by listing the features we want to be able to do:
- Move git's HEAD to a particular commit without touching the files or the index
- Move git's HEAD to a particular commit and clear the index but
without touching the files
- Move git's HEAD to a particular commit and clear the index and have
all the files match that particular commit files
- Move git's HEAD to a particular commit and clear the index and have
all the files match that particular commit files and remove files that
are unknown to that commit
Is there a scenario I'm missing? Once we have the scenarios nailed
down we can start thinking about how to express them.
Philippe
next prev parent reply other threads:[~2011-12-02 14:27 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
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 [this message]
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=CAGK7Mr7zdstbm7QsrYq9a6m9ui_r8Ak8XtyWADLQ0n-mXiov4w@mail.gmail.com \
--to=philippe.vaucher@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phil.hord@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).