From: Jan Engelhardt <jengelh@inai.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Phil Hord <phil.hord@gmail.com>,
Philippe Vaucher <philippe.vaucher@gmail.com>,
git@vger.kernel.org, Christian Couder <chriscool@tuxfamily.org>
Subject: Re: Proposal: create meaningful aliases for git reset's hard/soft/mixed
Date: Sat, 15 Dec 2012 19:57:57 +0100 (CET) [thread overview]
Message-ID: <alpine.LNX.2.01.1212151955330.14667@nerf07.vanv.qr> (raw)
In-Reply-To: <7vhaqb4bvb.fsf@alter.siamese.dyndns.org>
On Wednesday 2012-10-03 21:03, Junio C Hamano wrote:
>
>I said that "git reset --keep" started out as an ugly workaround for
>the lack of "git checkout -B $current_branch". Now we have it, so
>we can afford to make "reset --keep" less prominently advertised in
>our tool set. As I already said back then, "reset --soft" also has
>outlived its usefulness when "commit --amend" came, so that leaves
>only these modes of "reset":
Soft is still useful, partway. Consider patch splitting (where easily
possible):
$ git add foo.c bar.c
$ git commit -m foo,bar
[other commits]
$ git rebase -i FOOBARCOMMIT^
[mark foo,bar for edit]
$ git reset --soft HEAD^
$ git reset bar.c
$ git commit -m foo
$ git add bar.c
$ git commit -m bar
$ git rebase --continue
next prev parent reply other threads:[~2012-12-15 18:58 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
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 [this message]
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=alpine.LNX.2.01.1212151955330.14667@nerf07.vanv.qr \
--to=jengelh@inai.de \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phil.hord@gmail.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).