Junio C Hamano  committed 4662231 Merge

Merge branch 'maint'

* maint:
GIT v1.5.1.4
Add howto files to rpm packages.
wcwidth redeclaration
user-manual: fix clone and fetch typos

  • Participants
  • Parent commits a42cbac, 1cc202b

Comments (0)

Files changed (4)

File Documentation/RelNotes-

+GIT v1.5.1.4 Release Notes
+Fixes since v1.5.1.3
+* Bugfixes
+  - "git-http-fetch" did not work around a bug in libcurl
+    earlier than 7.16 (curl_multi_remove_handle() was broken).
+  - "git cvsserver" handles a file that was once removed and
+    then added again correctly.
+  - import-tars script (in contrib/) handles GNU tar archives
+    that contain pathnames longer than 100 bytes (long-link
+    extension) correctly.
+  - xdelta test program did not build correctly.
+  - gitweb sometimes tried incorrectly to apply function to
+    decode utf8 twice, resulting in corrupt output.
+  - "git blame -C" mishandled text at the end of a group of
+    lines.
+  - "git log/rev-list --boundary" did not produce output
+    correctly without --left-right option.
+  - Many documentation updates.

File Documentation/user-manual.txt

 first create a new clone of the repository:
-$ git clone --bare proj.git
+$ git clone --bare ~/proj proj.git
-The resulting directory proj.git will contains a "bare" git
-repository--it is just the contents of the ".git" directory, without
-a checked-out copy of a working directory.
+The resulting directory proj.git contains a "bare" git repository--it is
+just the contents of the ".git" directory, without a checked-out copy of
+a working directory.
 Next, copy proj.git to the server where you plan to host the
 public repository.  You can use scp, rsync, or whatever is most
 then the following commands will all do the same thing:
-$ git fetch git:// master:ref/remotes/example/master
-$ git fetch example master:ref/remotes/example/master
-$ git fetch example example/master
+$ git fetch git:// master:refs/remotes/example/master
+$ git fetch example master:refs/remotes/example/master
 $ git fetch example
 %doc README COPYING Documentation/*.txt
-%{!?_without_docs: %doc Documentation/*.html }
+%{!?_without_docs: %doc Documentation/*.html Documentation/howto}
+* Tue May 8 2007 Quy Tonthat <>
+- Added howto files
 * Tue Mar 27 2007 Eygene Ryabinkin <>
 - Added the git-p4 package: Perforce import stuff.
  * in ISO 10646.
-static int wcwidth(ucs_char_t ch)
+static int git_wcwidth(ucs_char_t ch)
 	 * Sorted list of non-overlapping intervals of non-spacing characters,
 		return 0;
-	return wcwidth(ch);
+	return git_wcwidth(ch);
 int is_utf8(const char *text)