diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-09-03 09:24:16 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-09-05 10:47:44 +0000 |
| commit | 880579dc1e368bd6111b6f2d4c4449f4d42cd1b3 (patch) | |
| tree | 606173b467acb04ee75e0b2809671976d38e1cdd /Doc | |
| parent | 5445d5f0cc26f03eda26f8c74723a8fb65466586 (diff) | |
| download | zsh-880579dc1e368bd6111b6f2d4c4449f4d42cd1b3.tar.gz zsh-880579dc1e368bd6111b6f2d4c4449f4d42cd1b3.tar.xz zsh-880579dc1e368bd6111b6f2d4c4449f4d42cd1b3.zip | |
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
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/Zsh/contrib.yo | 2 |
1 files changed, 1 insertions, 1 deletions
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). |