threads / patch / 16761

patchdoc/git-reset: add reference to git-stash

Subject: [PATCH] doc/git-reset: add reference to git-stash

## tl;dr

4 messages between Dec 17, 2008 and Dec 17, 2008. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Markus Heidelberg· Dec 17, 2008, 02:59 UTC · lore

The "Interrupted workflow" situation is a good example for using git-stash.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
---
 Documentation/git-reset.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Show changes to Documentation/git-reset.txt +2 −0

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 52aab5e..29156f6 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -177,6 +177,8 @@ $ git reset                                       <3>
 <3> At this point the index file still has all the WIP changes you
     committed as 'snapshot WIP'.  This updates the index to show your
     WIP files as uncommitted.
++
+See also linkgit:git-stash[1].
 
 Reset a single file in the index::
 +

-- 
1.6.1.rc3.23.gaf48b

Miklos Vajna· Dec 17, 2008, 04:11 UTC · re: Markus Heidelberg · lore

Re: [PATCH] doc/git-reset: add reference to git-stash

On Wed, Dec 17, 2008 at 03:59:36AM +0100, Markus Heidelberg <markus.heidelberg@web.de> wrote:

> ++
> +See also linkgit:git-stash[1].

Manpages have a dedicated "SEE-ALSO" section. What about this?

(See Documentation/git-commit.txt for an example.)

---
 Documentation/git-reset.txt |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Show changes to Documentation/git-reset.txt +4 −0

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 52aab5e..e7ddc43 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -195,6 +195,10 @@ $ git add frotz.c                           <3>
 <2> This commits all other changes in the index.
 <3> Adds the file to the index again.
 
+SEE ALSO
+--------
+linkgit:git-stash[1]
+
 Author
 ------
 Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds <torvalds@osdl.org>

Markus Heidelberg· Dec 17, 2008, 08:49 UTC · re: Miklos Vajna · lore

Re: [PATCH] doc/git-reset: add reference to git-stash

Miklos Vajna, 17.12.2008:

Show 5 quoted lines

> On Wed, Dec 17, 2008 at 03:59:36AM +0100, Markus Heidelberg <markus.heidelberg@web.de> wrote:
> > ++
> > +See also linkgit:git-stash[1].
> 
> Manpages have a dedicated "SEE-ALSO" section. What about this?

That's only appropriate if the commands are generally related to each other, which isn't true for git-reset and git-stash.

> (See Documentation/git-commit.txt for an example.)

man git-commit /See -> I get 4 search matches outside of the "SEE ALSO" section and it makes sense in these cases.

Markus

Miklos Vajna· Dec 17, 2008, 14:33 UTC · re: Markus Heidelberg · lore

Re: [PATCH] doc/git-reset: add reference to git-stash

On Wed, Dec 17, 2008 at 09:49:42AM +0100, Markus Heidelberg <markus.heidelberg@web.de> wrote:

Show 9 quoted lines

> Miklos Vajna, 17.12.2008:
> > On Wed, Dec 17, 2008 at 03:59:36AM +0100, Markus Heidelberg <markus.heidelberg@web.de> wrote:
> > > ++
> > > +See also linkgit:git-stash[1].
> > 
> > Manpages have a dedicated "SEE-ALSO" section. What about this?
> 
> That's only appropriate if the commands are generally related to each
> other, which isn't true for git-reset and git-stash.

Ah, OK.