From 74190d2363a1be81b06992bebbff6bd59f943fe7 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 19 May 2008 16:08:33 -0400 Subject: [PATCH 1/2] doc/git-daemon: s/uploadarchive/uploadarch/ The git-daemon upload-archive feature has always used the config directive 'daemon.uploadarch'; the documentation which came later seems to have just mistakenly used the wrong name. Noticed by lionel@over-blog.com. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/git-daemon.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index fd83bc7833..cf261dd40d 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -174,7 +174,7 @@ upload-pack:: upload-archive:: This serves `git-archive --remote`. It is disabled by default, but a repository can enable it by setting - `daemon.uploadarchive` configuration item to `true`. + `daemon.uploadarch` configuration item to `true`. receive-pack:: This serves `git-send-pack` clients, allowing anonymous @@ -257,7 +257,7 @@ selectively enable/disable services per repository:: ---------------------------------------------------------------- [daemon] uploadpack = false - uploadarchive = true + uploadarch = true ---------------------------------------------------------------- From e77b0b5d0fdac411607dbae11ccad87dccd332d3 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 19 May 2008 16:09:06 -0400 Subject: [PATCH 2/2] git-am: fix typo in usage message Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- git-am.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-am.sh b/git-am.sh index 851f85eb55..4dce87bdff 100755 --- a/git-am.sh +++ b/git-am.sh @@ -10,7 +10,7 @@ git-am [options] --skip -- d,dotest= use and not .dotest i,interactive run interactively -b,binary pass --allo-binary-replacement to git-apply +b,binary pass --allow-binary-replacement to git-apply 3,3way allow fall back on 3way merging if needed s,signoff add a Signed-off-by line to the commit message u,utf8 recode into utf8 (default)