diff --git a/Documentation/config.txt b/Documentation/config.txt
index e669003f72..d89916bea7 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -223,14 +223,14 @@ showbranch.default::
 	See gitlink:git-show-branch[1].
 
 tar.umask::
-	By default, git-link:git-tar-tree[1] sets file and directories modes
+	By default, gitlink:git-tar-tree[1] sets file and directories modes
 	to 0666 or 0777. While this is both useful and acceptable for projects
 	such as the Linux Kernel, it might be excessive for other projects.
 	With this variable, it becomes possible to tell
-	git-link:git-tar-tree[1] to apply a specific umask to the modes above.
+	gitlink:git-tar-tree[1] to apply a specific umask to the modes above.
 	The special value "user" indicates that the user's current umask will
 	be used. This should be enough for most projects, as it will lead to
-	the same permissions as git-link:git-checkout[1] would use. The default
+	the same permissions as gitlink:git-checkout[1] would use. The default
 	value remains 0, which means world read-write.
 
 user.email::
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index b0c6d7c303..d21d66bfeb 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -116,7 +116,7 @@ file each time git-cvsimport is run.
 +
 It is not recommended to use this feature if you intend to
 export changes back to CVS again later with
-git-link[1]::git-cvsexportcommit.
+gitlink:git-cvsexportcommit[1].
 
 OUTPUT
 ------
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 56afd64f42..d4ae99fa53 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -8,7 +8,7 @@ git-push - Update remote refs along with associated objects
 
 SYNOPSIS
 --------
-'git-push' [--all] [--tags] [--force] <repository> <refspec>...
+'git-push' [--all] [--tags] [-f | --force] <repository> <refspec>...
 
 DESCRIPTION
 -----------
diff --git a/Makefile b/Makefile
index 6f7e0cdef5..704101defe 100644
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ PROGRAMS = \
 	git-hash-object$X git-index-pack$X git-local-fetch$X \
 	git-merge-base$X \
 	git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \
-	git-peek-remote$X git-prune-packed$X git-receive-pack$X \
+	git-peek-remote$X git-receive-pack$X \
 	git-send-pack$X git-shell$X \
 	git-show-index$X git-ssh-fetch$X \
 	git-ssh-upload$X git-unpack-file$X \
@@ -217,7 +217,7 @@ BUILT_INS = git-log$X git-whatchanged$X git-show$X git-update-ref$X \
 	git-read-tree$X git-commit-tree$X git-write-tree$X \
 	git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
 	git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
-	git-fmt-merge-msg$X git-prune$X git-mv$X
+	git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X
 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -274,7 +274,7 @@ BUILTIN_OBJS = \
 	builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \
 	builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
 	builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
-	builtin-mv.o
+	builtin-mv.o builtin-prune-packed.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 EXTLIBS = -lz
diff --git a/prune-packed.c b/builtin-prune-packed.c
similarity index 95%
rename from prune-packed.c
rename to builtin-prune-packed.c
index d24b097114..d0ff336c14 100644
--- a/prune-packed.c
+++ b/builtin-prune-packed.c
@@ -54,12 +54,10 @@ static void prune_packed_objects(void)
 	}
 }
 
-int main(int argc, char **argv)
+int cmd_prune_packed(int argc, char **argv, const char *prefix)
 {
 	int i;
 
-	setup_git_directory();
-
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
 
diff --git a/builtin-push.c b/builtin-push.c
index a824171066..c39dd1e092 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -8,7 +8,7 @@
 
 #define MAX_URI (16)
 
-static const char push_usage[] = "git push [--all] [--tags] [--force] <repository> [<refspec>...]";
+static const char push_usage[] = "git push [--all] [--tags] [-f | --force] <repository> [<refspec>...]";
 
 static int all = 0, tags = 0, force = 0, thin = 1;
 static const char *execute = NULL;
@@ -291,7 +291,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 			tags = 1;
 			continue;
 		}
-		if (!strcmp(arg, "--force")) {
+		if (!strcmp(arg, "--force") || !strcmp(arg, "-f")) {
 			force = 1;
 			continue;
 		}
diff --git a/builtin.h b/builtin.h
index f10d3b77c8..7ddfe2891c 100644
--- a/builtin.h
+++ b/builtin.h
@@ -20,6 +20,7 @@ extern int cmd_format_patch(int argc, const char **argv, const char *prefix);
 extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
 
 extern int cmd_prune(int argc, const char **argv, const char *prefix);
+extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
 
 extern int cmd_push(int argc, const char **argv, const char *prefix);
 extern int cmd_grep(int argc, const char **argv, const char *prefix);
diff --git a/git-annotate.perl b/git-annotate.perl
index 0a8c38db00..6613247074 100755
--- a/git-annotate.perl
+++ b/git-annotate.perl
@@ -309,7 +309,6 @@ sub _git_diff_parse {
 
 			$gotheader = 1;
 
-			printf("Copying from %d to %d\n", $ri, $remstart);
 			foreach my $parent (@$parents) {
 				for (my $i = $ri; $i < $remstart; $i++) {
 					$plines{$parent}[$pi{$parent}++] = $slines->[$i];
diff --git a/git-push.sh b/git-push.sh
deleted file mode 100755
index 21775fc21a..0000000000
--- a/git-push.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-USAGE='[--all] [--tags] [--force] <repository> [<refspec>...]'
-. git-sh-setup
-
-# Parse out parameters and then stop at remote, so that we can
-# translate it using .git/branches information
-has_all=
-has_force=
-has_exec=
-has_thin=--thin
-remote=
-do_tags=
-
-while case "$#" in 0) break ;; esac
-do
-	case "$1" in
-	--all)
-		has_all=--all ;;
-	--tags)
-		do_tags=yes ;;
-	--force)
-		has_force=--force ;;
-	--exec=*)
-		has_exec="$1" ;;
-	--thin)
-		;; # noop
-	--no-thin)
-		has_thin= ;;
-	-*)
-                usage ;;
-        *)
-		set x "$@"
-		shift
-		break ;;
-	esac
-	shift
-done
-case "$#" in
-0)
-	echo "Where would you want to push today?"
-        usage ;;
-esac
-
-. git-parse-remote
-remote=$(get_remote_url "$@")
-
-case "$has_all" in
---all)
-	set x ;;
-'')
-	case "$do_tags,$#" in
-	yes,1)
-		set x $(cd "$GIT_DIR/refs" && find tags -type f -print) ;;
-	yes,*)
-		set x $(cd "$GIT_DIR/refs" && find tags -type f -print) \
-		    $(get_remote_refs_for_push "$@") ;;
-	,*)
-		set x $(get_remote_refs_for_push "$@") ;;
-	esac
-esac
-
-shift ;# away the initial 'x'
-
-# $# is now 0 if there was no explicit refspec on the command line
-# and there was no default refspec to push from remotes/ file.
-# we will let git-send-pack to do its "matching refs" thing.
-
-case "$remote" in
-git://*)
-	die "Cannot use READ-ONLY transport to push to $remote" ;;
-rsync://*)
-        die "Pushing with rsync transport is deprecated" ;;
-esac
-
-set x "$remote" "$@"; shift
-test "$has_all" && set x "$has_all" "$@" && shift
-test "$has_force" && set x "$has_force" "$@" && shift
-test "$has_exec" && set x "$has_exec" "$@" && shift
-test "$has_thin" && set x "$has_thin" "$@" && shift
-
-case "$remote" in
-http://* | https://*)
-	exec git-http-push "$@";;
-*)
-	exec git-send-pack "$@";;
-esac
diff --git a/git.c b/git.c
index 110e82e9ac..5b50762de1 100644
--- a/git.c
+++ b/git.c
@@ -263,6 +263,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
 		{ "fmt-merge-msg", cmd_fmt_merge_msg, NEEDS_PREFIX },
 		{ "prune", cmd_prune, NEEDS_PREFIX },
 		{ "mv", cmd_mv, NEEDS_PREFIX },
+		{ "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
 	};
 	int i;