From 880579dc1e368bd6111b6f2d4c4449f4d42cd1b3 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Thu, 3 Sep 2015 09:24:16 +0000 Subject: 36410: vcs_info git: Present merge heads as patches This shows, during 'git merge', the revision hashes of the "remote" head (the one that will become second parent of the commit) in the %m expando. Review-by: Frank Terbeck --- Doc/Zsh/contrib.yo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Doc/Zsh/contrib.yo') diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index db0940d94..741d4ad07 100644 --- a/Doc/Zsh/contrib.yo +++ b/Doc/Zsh/contrib.yo @@ -1339,7 +1339,7 @@ tt(formats) and tt(actionformats) and will be available in the global tt(backend_misc) array as tt(${backend_misc[bookmarks]}). ) item(tt(gen-applied-string))( -Called in the tt(git) (with tt(stgit) or during rebase), and tt(hg) +Called in the tt(git) (with tt(stgit) or during rebase or merge), and tt(hg) (with tt(mq)) backends and in tt(quilt) support when the tt(applied-string) is generated; the tt(use-quilt) zstyle must be true for tt(quilt) (the tt(mq) and tt(stgit) backends are active by default). -- cgit 1.4.1