Re: [PATCH] git-checkout(1) mention fate of extraneous files

From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Jan 17, 2009, 12:57 UTC
Message-ID: <200901171357.18005.markus.heidelberg@web.de>
In-Reply-To: <87k58u4vlq.fsf@jidanni.org>

jidanni@jidanni.org, 17.01.2009:

> Signed-off-by: jidanni <jidanni@jidanni.org>
> ---
>  Documentation/git-checkout.txt |   13 +++++++------
>  1 files changed, 7 insertions(+), 6 deletions(-)

Show 13 quoted lines

> -When <paths> are not given, this command switches branches by
> -updating the index and working tree to reflect the specified
> -branch, <branch>, and updating HEAD to be <branch> or, if
> -specified, <new_branch>.  Using -b will cause <new_branch> to
> -be created; in this case you can use the --track or --no-track
> -options, which will be passed to `git branch`.
> +When <paths> are not given, this command switches branches by updating
> +the index and working tree to reflect the specified branch, <branch>,
> +and updating HEAD to be <branch> or, if specified, <new_branch>. (No
> +extraneous files present are deleted, use linkgit:git-clean[1] for a
> +pristine checkout.) Using -b will cause <new_branch> to be created; in
> +this case you can use the --track or --no-track options, which will be
> +passed to `git branch`.

Why do you reformat the whole paragraph? Just inserting your sentence would give a much nicer diff for easier review, it's no difference for asciidoc. Indeed to find the change, I just copied the old and new text into two Vim windows, reformatted and diffed them.

Then you would get this

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

Markus