# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1202466902 -3600
# Node ID e183f3b9154c0d494f67a101662859b9345d3795
# Parent  54e86898dd7dfdf69269c8fc9e4d9bdf39b1b0bc
Use "git COMMAND", not "git-COMMAND".

* build-aux/bootstrap (version_controlled_file): s/git-rm/git-rm/.
* build-aux/announce-gen (get_tool_versions): Correct a diagnostic.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-02-08  Jim Meyering  <meyering@redhat.com>
 
+	Use "git COMMAND", not "git-COMMAND".
+	* build-aux/bootstrap (version_controlled_file): s/git-rm/git-rm/.
+	* build-aux/announce-gen (get_tool_versions): Correct a diagnostic.
 	* build-aux/git-version-gen: Use "git status", not "git-status".
 
 2008-02-07  Bruno Haible  <bruno@clisp.org>
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # Generate a release announcement message.
 
-my $VERSION = '2008-01-12 08:52'; # UTC
+my $VERSION = '2008-02-08 10:34'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -413,7 +413,7 @@
 
   grep (/^gnulib$/, @tool_list) ^ defined $gnulib_version
     and (warn "$ME: when specifying gnulib as a tool, you must also specify\n"
-	. "--gnulib-version=V, where V is the result of running git-describe\n"
+	. "--gnulib-version=V, where V is the result of running git describe\n"
 	. "in the gnulib source directory.\n"), $fail = 1;
 
   exists $valid_release_types{$release_type}
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -408,7 +408,7 @@
     grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
 	     grep '^/[^/]*/[0-9]' > /dev/null && found=yes
   elif test -d .git; then
-    git-rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+    git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
   else
     echo "$0: no version control for $dir/$file?" >&2
   fi