From 9a3e36cd67fce2bfcc0726193feee493ccdbf0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Granskogen=20Bj=C3=B8rnstad?= Date: Thu, 2 May 2013 20:24:15 +0200 Subject: Documentation/git-commit: Typo under --edit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -C takes a commit object, not a file. Signed-off-by: Anders Granskogen Bjørnstad Signed-off-by: Junio C Hamano diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 9b1be55..8172938 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -197,8 +197,8 @@ variable (see linkgit:git-config[1]). -e:: --edit:: The message taken from file with `-F`, command line with - `-m`, and from file with `-C` are usually used as the - commit log message unmodified. This option lets you + `-m`, and from commit object with `-C` are usually used as + the commit log message unmodified. This option lets you further edit the message taken from these sources. --no-edit:: -- cgit v0.10.2-6-g49f6 From 6606a69f451ebbed5692185938be55aea6e8f49f Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 3 May 2013 16:35:50 -0500 Subject: completion: zsh: don't override suffix on _detault zsh is smart enough to add the right suffix while completing, there's no point in trying to do the same as bash. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 49f0cb8..2565d2e 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -198,7 +198,7 @@ _git () emulate ksh -c __${service}_main fi - let _ret && _default -S '' && _ret=0 + let _ret && _default && _ret=0 return _ret } -- cgit v0.10.2-6-g49f6