From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH 0/6] git-reset.txt improvements
Date: Mon, 13 Sep 2010 10:06:30 +0200 [thread overview]
Message-ID: <cover.1284365021.git.git@drmicha.warpmail.net> (raw)
First of all: I've been out of the loop last week, so please forgive me if this
comes at the wrong phase of a cycle.
I portioned the changes to git-reset.txt and ordered them starting from the
least controversial, I hope. The descriptions of modes have grown organically
over time, and this series tries to make them consistent in structure and
wording, after cleaning up some minor issues. 6/6 is the "meat", so to say.
For the "--merge" description in 6/6: Please double check. I've tried to
understand the mode from the tables and from the inner works (git read-tre -u -m
plus carrying over unmerged entries) because I did not understand the original
description.
Michael J Gruber (6):
git-reset.txt: clarify branch vs. branch head
git-reset.txt: reset does not change files in target
git-reset.txt: reset --soft is not a no-op
git-reset.txt: use "working tree" consistently
git-reset.txt: point to git-checkout
git-reset.txt: make modes description more consistent
Documentation/git-reset.txt | 63 ++++++++++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 25 deletions(-)
--
1.7.3.rc1.215.g6997c
next reply other threads:[~2010-09-13 8:17 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-13 8:06 Michael J Gruber [this message]
2010-09-13 8:06 ` [PATCH 1/6] git-reset.txt: clarify branch vs. branch head Michael J Gruber
2010-09-14 0:35 ` Junio C Hamano
2010-09-13 8:06 ` [PATCH 2/6] git-reset.txt: reset does not change files in target Michael J Gruber
2010-09-14 0:12 ` Junio C Hamano
2010-09-13 8:06 ` [PATCH 3/6] git-reset.txt: reset --soft is not a no-op Michael J Gruber
2010-09-13 22:13 ` Jay Soffian
2010-09-13 23:19 ` Junio C Hamano
2010-09-13 8:06 ` [PATCH 4/6] git-reset.txt: use "working tree" consistently Michael J Gruber
2010-09-13 8:06 ` [PATCH 5/6] git-reset.txt: point to git-checkout Michael J Gruber
2010-09-14 0:19 ` Junio C Hamano
2010-09-13 8:06 ` [PATCH 6/6] git-reset.txt: make modes description more consistent Michael J Gruber
2010-09-14 0:35 ` Junio C Hamano
2010-09-15 20:47 ` Michael J Gruber
2010-09-13 22:15 ` [PATCH 0/6] git-reset.txt improvements Jay Soffian
2010-09-15 20:47 ` [PATCHv2 " Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 1/6] git-reset.txt: clarify branch vs. branch head Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 2/6] git-reset.txt: reset does not change files in target Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 3/6] git-reset.txt: reset --soft is not a no-op Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 4/6] git-reset.txt: use "working tree" consistently Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 5/6] git-reset.txt: point to git-checkout Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 6/6] git-reset.txt: make modes description more consistent Michael J Gruber
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=cover.1284365021.git.git@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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.