Merge branch 'maint'

* maint:
Fixed update-hook example allow-users format.
Documentation/git-svn: updated design philosophy notes
t/t4014: test "am -3" with mode-only change.
Fix lapsus in builtin-apply.c
git-push: documentation and tests for pushing only branches
git-svnimport: Use separate arguments in the pipe for git-rev-parse

diff --combined builtin-apply.c
index 05ce2205f34a6e8fe4ce17ceed6ee2ae7730779a,bd969778e063bab70eab14d6261d07edd926a115..86d89a4a7e9240a75e1500bba524acdcec7f14d2
--- 1/builtin-apply.c
--- 2/builtin-apply.c
+++ b/builtin-apply.c
@@@ -254,7 -254,7 +254,7 @@@ static char *find_name(const char *line
                if (name) {
                        char *cp = name;
                        while (p_value) {
-                               cp = strchr(name, '/');
+                               cp = strchr(cp, '/');
                                if (!cp)
                                        break;
                                cp++;
@@@ -2423,6 -2423,7 +2423,6 @@@ static void remove_file(struct patch *p
        if (update_index) {
                if (remove_file_from_cache(patch->old_name) < 0)
                        die("unable to remove %s from index", patch->old_name);
 -              cache_tree_invalidate_path(active_cache_tree, patch->old_name);
        }
        if (!cached) {
                if (S_ISGITLINK(patch->old_mode)) {
@@@ -2577,6 -2578,7 +2577,6 @@@ static void create_file(struct patch *p
                mode = S_IFREG | 0644;
        create_one_file(path, mode, buf, size);
        add_index_file(path, mode, buf, size);
 -      cache_tree_invalidate_path(active_cache_tree, path);
  }
  
  /* phase zero is to remove, phase one is to create */