diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3cd0e2a..e4e0478 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,8 +2,6 @@ name: CI
 
 on:
   pull_request:
-    branches:
-      - master
   push:
     branches:
       - master
diff --git a/src/git_function.jl b/src/git_function.jl
index 1a31f9d..0b2b2d8 100644
--- a/src/git_function.jl
+++ b/src/git_function.jl
@@ -56,10 +56,15 @@ function git(; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true)
         path = split(get(ENV, "PATH", ""), pathsep)
         libpath = split(get(ENV, LIBPATH_env, ""), pathsep)
 
-        path = vcat(dirname(OpenSSH_jll.ssh_path), path)
-        libpath = vcat(OpenSSH_jll.LIBPATH_list, libpath)
-        path = vcat(dirname(Git_jll.git_path), path)
-        libpath = vcat(Git_jll.LIBPATH_list, libpath)
+        @static if Sys.iswindows()
+            # Windows: we append OpenSSH_jll to the end of PATH
+            path = vcat(dirname(Git_jll.git_path), path, dirname(OpenSSH_jll.ssh_path))
+            libpath = vcat(Git_jll.LIBPATH_list, libpath, OpenSSH_jll.LIBPATH_list)
+        else
+            # All other platforms: we prepend OpenSSH_jll to the begining of PATH
+            path = vcat(dirname(Git_jll.git_path), dirname(OpenSSH_jll.ssh_path), path)
+            libpath = vcat(Git_jll.LIBPATH_list, OpenSSH_jll.LIBPATH_list, libpath)
+        end
 
         unique!(filter!(!isempty, path))
         unique!(filter!(!isempty, libpath))