* [PATCH 1/3] _git: rename merge.summary to merge.log
@ 2010-04-05 17:42 Hannu Koivisto
0 siblings, 0 replies; only message in thread
From: Hannu Koivisto @ 2010-04-05 17:42 UTC (permalink / raw)
To: zsh-workers
---
Hi,
Note that I'm not subscribed to zsh-workers. These three patches were made
with git but they should be applyable with normal patch as well. I hope they
are useful.
Hannu
Completion/Unix/Command/_git | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 5371fd5..96e3284 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -3290,7 +3290,7 @@ __git_config_name () {
'i18n.commitEncoding:character encoding commit messages are stored in'
'i18n.logOutputEncoding:character encoding commit messages are output in'
'log.showroot:whether to show initial commit as a diff against an empty tree or not'
- 'merge.summary:whether to include summaries of merged commits'
+ 'merge.log:whether to include summaries of merged commits'
'merge.tool:tool to use for merges (by git-mergetool)'
'merge.verbosity:amount of output shown by recursive merge strategy'
'pack.window:size of window used by git-pack-objects'
@@ -3739,7 +3739,7 @@ __git_config_values () {
_describe -t booleans 'boolean' booleans
;;
- ((#i)merge.summary)
+ ((#i)merge.log)
declare -a booleans
# TODO: Use (default) in more descriptions.
--
1.6.6.GIT
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-04-06 21:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-05 17:42 [PATCH 1/3] _git: rename merge.summary to merge.log Hannu Koivisto
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).