gitserve | restricted SSH server and library | SSH library

Short answer: use git pull --rebase

First of all your example does not work, client one would need to commit something else before the pull --ff-only, but lets assume we did this.

This command instructs git to fetch the latest state from the remote an then fast forward the branch if possible. So if we have different changes on the remote and local branch it will stop, because that is what we have told it to do with --ff-only

It will also fetch, but after that will do a git rebase origin/master. Witch will take all commits on master that are not already on the remote and rebase them to the end of origin/master. Of course you might have to fix any merge conflicts that arise. The only danger I see is you should test what happens if you have any merge commits in your branch, but since you want a linear history this should not be an issue for you.

What you're asking for isn't possible. Git doesn't have a way to spawn a browser (since one need not even be installed) and even if it did, it wouldn't have a way to extract any token or credentials from the browser it spawned.

You may, however, find a custom credential helper useful if you can cause it to invoke a browser like you want and then emit the token. Some environments also want to use a cookie for this purpose, and Git can use the http.cookiefile to read cookies in Netscape format. You could also set up a standard proxy configuration using the http_proxy environment variable and the user's credentials, but be careful that your proxy speaks HTTP/1.1 properly and doesn't perform any filtering, because broken proxies break Git in a variety of subtle ways.

I can't speak for GitLab, but I know GitHub also has support for SAML SSO built-in, so a reverse proxy isn't necessary. In such a case, you can continue to use personal access tokens or SSH keys to access the server while still requiring SSO for the web interface.

I should point out that in general restricting access like this using a reverse proxy in front of the Git host can break automation. You may want to allow SSH keys or some other approach to prevent your SAML SSO from breaking automated processes which are not associated with any user.

You normally would not have a .git folder in production folder: only your post-receive hook in the bare repo is allowed to modify (checkout -f) said production folder.

A production folder should not know anything about Git (unless Git is an essential element to actually run the program/project stored in "production")

You are trying to install to a mounted volume that has permissions set on the host to user ID 1028 but does not exist in the container so you can't write to the volume. To fix you can either set permissions on the volume to be more open, create a user with the same ID inside the container, or start the containers with the -u argument to specify the UID.

See the last line for specifying the UID and this article for more info on GID/UID with docker and this section of the Docker documentation for USER.

sudo d

As it turns out, I need to use -

This is a known issue in jx boot on Windows - https://github.com/jenkins-x/jx/issues/7156. Have you tried it using Windows Subsystem for Linux?

GoClipse doesn't actually do any tracking of the old name after the rename is done. Based on what you describe and the error imported and not used "gitserver/user/project/webserver" as portal you probably have an import line along the lines of portal "gitserver/user/project/webserver" somewhere, and probably in the same file it uses webserver.. Double check all your imports because these errors absolutely sound like the rename just got a little mixed up (something that's not uncommon when doing a rename and reusing the old name).

To update the remote repository, run git push -f while on your local master branch. This will overwrite the remote master branch, replacing it with your local version.

This is in general only something you should do on a branch of which you are the exclusive user. If other people are sharing the remote master branch, overwriting it like this will make it difficult for them merge any changes based on the old value of the master branch.

If you have your per-user or system configuration settings properly set, then Git will automatically invoke Git LFS when cloning a repository that uses Git LFS.

The easiest way to do this is to run git lfs install --skip-repo, which will modify your .gitconfig to contain the proper entries. You can verify that your configuration is correct by running git lfs env and making sure that the last three git config options printed are non-empty.

Once that's set up, any time you clone a new repository using Git LFS, the LFS files will be automatically fetched and filled in. If you have an existing repository, you can use git lfs checkout to check out the files manually.