From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: bebarino@gmail.com, srabbelier@gmail.com,
Thomas Rast <trast@student.ethz.ch>,
Jakub Narebski <jnareb@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [RFC/PATCH 0/2] Documentation: kicking the "reset --hard" habit
Date: Fri, 29 Oct 2010 03:35:16 -0500 [thread overview]
Message-ID: <20101029083516.GA26290@burratino> (raw)
Hi,
Kira on IRC reminded me that our introductory documentation does
not explain how to use the new reset --keep and --merge primitives.
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.
Jonathan Nieder (2):
Documentation: suggest "reset --merge" more often
Documentation: suggest "reset --keep" more often
Documentation/git-bisect-lk2009.txt | 2 +-
Documentation/git-bisect.txt | 2 +-
Documentation/git-checkout.txt | 2 +-
Documentation/git-merge.txt | 2 +-
Documentation/git-rerere.txt | 2 +-
Documentation/git-reset.txt | 13 ++++++-----
Documentation/gitcore-tutorial.txt | 6 ++--
Documentation/gitworkflows.txt | 2 +-
Documentation/howto/maintain-git.txt | 4 +-
Documentation/howto/separating-topic-branches.txt | 2 +-
Documentation/user-manual.txt | 22 ++++++++++++++------
11 files changed, 34 insertions(+), 25 deletions(-)
next reply other threads:[~2010-10-29 8:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-29 8:35 Jonathan Nieder [this message]
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 ` [RFC/PATCH 0/2] Documentation: kicking the "reset --hard" habit Matthieu Moy
2010-10-31 3:53 ` 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=20101029083516.GA26290@burratino \
--to=jrnieder@gmail.com \
--cc=bebarino@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=jnareb@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.