mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-27 04:40:59 +01:00
Code Releases Activity

unposted: Fix typo in comment.

Browse source
This commit is contained in:
Daniel Shahaf 2016-01-15 06:30:06 +00:00
parent ce1148db45
commit a45a9fa104
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2016-01-15 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted: Functions/VCS_Info/Backends/VCS_INFO_detect_p4:
Fix typo in comment.
* 37612: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: Set $git_patches_unapplied correctly for
'rebase-apply' case.

4
Functions/VCS_Info/Backends/VCS_INFO_detect_p4
View file

@ -2,7 +2,7 @@
## perforce support by: Phil Pennock
## Distributed under the same BSD-ish license as zsh itself.
# If user-server is true in the :vcs_info:p4:... context, contact the
# If use-server is true in the :vcs_info:p4:... context, contact the
# server to decide whether the directory is handled by Perforce. This can
# cause a delay if the network times out, in particular if looking up the
# server name failed. Hence this is not the default. If a timeout
@ -10,7 +10,7 @@
# vcs_info_p4_dead_servers and the server is never contacted again. The
# array must be edited by hand to remove it.
#
# If user-server is false or not set, the function looks to see if there is
# If use-server is false or not set, the function looks to see if there is
# a file $P4CONFIG somewhere above in the hierarchy. This is far from
# foolproof; in fact it relies on you using the particular working practice
# of having such files in all client root directories and nowhere above.