Merge with master changes.

diff --git a/Documentation/git-show-branches-script.txt b/Documentation/git-show-branches-script.txt
index 95c7013445ec7afdae72d7469142c77adcc3068f..c7fb02cf7b4c5d783de05655299360e774601f0a 100644 (file)
--- a/Documentation/git-show-branches-script.txt
+++ b/Documentation/git-show-branches-script.txt
@@ -37,15 +37,17 @@ otherwise it shows a space.
 The following example shows three branches, "pu", "master" and
 "rc":
 
-       * [pu] Add cheap local clone '-s' flag to git-clone-script
-        ! [master] Documentation updates.
-         ! [rc] Merge master into rc
-       +   Add cheap local clone '-s' flag to git-clone-script
-       +   Alternate object pool mechanism updates.
-       +   Audit rev-parse users.
-       ++  Documentation updates.
-         + Merge master into rc
-       +++ [PATCH] plug memory leak in diff.c::diff_free_filepair()
+------------------------------------------------
+* [pu] Add cheap local clone '-s' flag to git-clone-script
+ ! [master] Documentation updates.
+  ! [rc] Merge master into rc
++   Add cheap local clone '-s' flag to git-clone-script
++   Alternate object pool mechanism updates.
++   Audit rev-parse users.
+++  Documentation updates.
+  + Merge master into rc
++++ [PATCH] plug memory leak in diff.c::diff_free_filepair()
+------------------------------------------------
 
 These three branches all forked from a common commit, "[PATCH]
 plug memory leak...", and "rc" has one commit ahead of it.  The

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 27f362626f5258e49f3b4aa1648a411e5829eab2..be26614ffbfca315943daa11dc0c4523d6ed6f58 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -74,9 +74,16 @@ link:git-write-tree.html[git-write-tree]::
 link:git-pack-objects.html[git-pack-objects]::
        Creates a packed archive of objects.
 
+link:git-unpack-objects.html[git-unpack-objects]::
+       Unpacks objects out of a packed archive.
+
 link:git-prune-packed.html[git-prune-packed]::
        Remove extra objects that are already in pack files.
 
+link:git-apply.html[git-apply]::
+       Reads a "diff -up1" or git generated patch file and
+       applies it to the working tree.
+
 
 Interrogation commands
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -92,6 +99,9 @@ link:git-diff-files.html[git-diff-files]::
 link:git-diff-tree.html[git-diff-tree]::
        Compares the content and mode of blobs found via two tree objects
 
+link:git-diff-stages.html[git-diff-stages]::
+       Compares two "merge stages" in the index file.
+
 link:git-export.html[git-export]::
        Exports each commit and a diff against each of its parents
 
@@ -122,6 +132,9 @@ link:git-unpack-file.html[git-unpack-file]::
 link:git-var.html[git-var]::
        Displays a git logical variable
 
+link:git-show-index.html[git-show-index]::
+       Displays contents of a pack idx file.
+
 link:git-verify-pack.html[git-verify-pack]::
        Validates packed GIT archive files
 
@@ -201,6 +214,12 @@ link:git-show-branches-script.html[git-show-branches-script]::
 link:git-repack-script.html[git-repack-script]::
        Pack unpacked objects in a repository.
 
+link:git-rename-script.html[git-rename]::
+       Rename files and directories.
+
+link:git-ls-remote-script.html[git-ls-remote-script]::
+       Shows references in a remote or local repository.
+
 
 Ancillary Commands
 ------------------
@@ -224,6 +243,9 @@ link:git-resolve-script.html[git-resolve-script]::
 link:git-tag-script.html[git-tag-script]::
        An example script to create a tag object signed with GPG
 
+link:git-cvsimport-script.html[git-cvsimport-script]::
+       Salvage your data out of another SCM people love to hate.
+
 
 Interrogators:
 
@@ -233,6 +255,8 @@ link:git-diff-helper.html[git-diff-helper]::
 link:git-ssh-push.html[git-ssh-push]::
        Helper "server-side" program used by git-ssh-pull
 
+link:git-send-email-script.html[git-send-email]::
+       Send patch e-mails out of "format-patch --mbox" output.
 
 
 Identifier Terminology

diff --git a/refs.c b/refs.c
index a5c894661090549e1676c7dd26fd2f72eb330d9f..161018097def05f717ae20e59e3df6cc1b01ab77 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -46,7 +46,7 @@ static int do_for_each_ref(const char *base, int (*fn)(const char *path, const u
                        if (namelen > 255)
                                continue;
                        memcpy(path + baselen, de->d_name, namelen+1);
-                       if (lstat(git_path("%s", path), &st) < 0)
+                       if (stat(git_path("%s", path), &st) < 0)
                                continue;
                        if (S_ISDIR(st.st_mode)) {
                                retval = do_for_each_ref(path, fn);