diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index f991b4e85..abc67383e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 index 377453f6a..95a534786 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 +++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 @@ -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. |