git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Documentation: fix a few typos in git-notes.txt
@ 2010-03-04 14:31 Michael J Gruber
  2010-03-04 17:08 ` Johan Herland
  0 siblings, 1 reply; 2+ messages in thread
From: Michael J Gruber @ 2010-03-04 14:31 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
This is based on next and is orthogonal to tr/notes-display in pu.

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

diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 14f73b9..bef2f39 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -46,13 +46,13 @@ list::
 
 add::
 	Add notes for a given object (defaults to HEAD). Abort if the
-	object already has notes, abort. (use `-f` to overwrite an
+	object already has notes (use `-f` to overwrite an
 	existing note).
 
 copy::
 	Copy the notes for the first object onto the second object.
 	Abort if the second object already has notes, or if the first
-	objects has none. (use -f to overwrite existing notes to the
+	object has none (use -f to overwrite existing notes to the
 	second object). This subcommand is equivalent to:
 	`git notes add [-f] -C $(git notes list <from-object>) <to-object>`
 
-- 
1.7.0.1.300.gd855a

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Documentation: fix a few typos in git-notes.txt
  2010-03-04 14:31 [PATCH] Documentation: fix a few typos in git-notes.txt Michael J Gruber
@ 2010-03-04 17:08 ` Johan Herland
  0 siblings, 0 replies; 2+ messages in thread
From: Johan Herland @ 2010-03-04 17:08 UTC (permalink / raw)
  To: Michael J Gruber; +Cc: git, Junio C Hamano

On Thursday 04 March 2010, Michael J Gruber wrote:
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>

Acked-by: Johan Herland <johan@herland.net>


...Johan

> ---
> This is based on next and is orthogonal to tr/notes-display in pu.
>
>  Documentation/git-notes.txt |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-notes.txt
> b/Documentation/git-notes.txt index 14f73b9..bef2f39 100644
> --- a/Documentation/git-notes.txt
> +++ b/Documentation/git-notes.txt
> @@ -46,13 +46,13 @@ list::
>
>  add::
>  	Add notes for a given object (defaults to HEAD). Abort if the
> -	object already has notes, abort. (use `-f` to overwrite an
> +	object already has notes (use `-f` to overwrite an
>  	existing note).
>
>  copy::
>  	Copy the notes for the first object onto the second object.
>  	Abort if the second object already has notes, or if the first
> -	objects has none. (use -f to overwrite existing notes to the
> +	object has none (use -f to overwrite existing notes to the
>  	second object). This subcommand is equivalent to:
>  	`git notes add [-f] -C $(git notes list <from-object>) <to-object>`



-- 
Johan Herland, <johan@herland.net>
www.herland.net

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-03-04 17:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-04 14:31 [PATCH] Documentation: fix a few typos in git-notes.txt Michael J Gruber
2010-03-04 17:08 ` Johan Herland

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).