From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, bebarino@gmail.com, srabbelier@gmail.com,
Thomas Rast <trast@student.ethz.ch>,
Jakub Narebski <jnareb@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [RFC/PATCH 0/2] Documentation: kicking the "reset --hard" habit
Date: Sat, 30 Oct 2010 03:55:50 +0200 [thread overview]
Message-ID: <vpqzktwv3yx.fsf@bauges.imag.fr> (raw)
In-Reply-To: <20101029083516.GA26290@burratino> (Jonathan Nieder's message of "Fri\, 29 Oct 2010 03\:35\:16 -0500")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Sadly, at least the user manual change suggested below is probably
> not suitable, since reset --keep and --merge have not been around
> since git 1.5.3 days. Ideas for working around that and other
> comments would be welcome.
Do we really want to keep the user manual compatible with 1.5.3
forever? It's nice to keep the user manual usable by slightly outdated
Gits, but 1.5.3 starts being really old, and older docs are still
available on the web (like
http://www.kernel.org/pub/software/scm/git/docs/v1.5.3.8/git.html ).
git reset --merge appeared in Git 1.6.2, it sounds reasonable to say
the current user manual works from this version.
git reset --keep appeared in 1.7.1, hence far more recently. But I
think it can still be mentionned at least as an alternative to --hard.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2010-10-30 1:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-29 8:35 [RFC/PATCH 0/2] Documentation: kicking the "reset --hard" habit Jonathan Nieder
2010-10-29 8:38 ` [RFC/PATCH 1/2] Documentation: suggest "reset --merge" more often Jonathan Nieder
2010-11-03 9:32 ` Stephen Boyd
2010-10-29 8:39 ` [RFC/PATCH 2/2] Documentation: suggest "reset --keep" " Jonathan Nieder
2010-10-30 1:55 ` Matthieu Moy [this message]
2010-10-31 3:53 ` [RFC/PATCH 0/2] Documentation: kicking the "reset --hard" habit Junio C Hamano
2010-10-31 14:04 ` Matthieu Moy
2010-11-05 14:39 ` Oldest Currently Distributed Git {Re: [RFC/PATCH 0/2] Documentation: kicking the "reset --hard" habit} Drew Northup
2010-10-31 17:25 ` [RFC/PATCH 0/2] Documentation: kicking the "reset --hard" habit Ævar Arnfjörð Bjarmason
2010-11-01 20:03 ` J. Bruce Fields
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=vpqzktwv3yx.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=bebarino@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=jrnieder@gmail.com \
--cc=srabbelier@gmail.com \
--cc=trast@student.ethz.ch \
/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).