... Git has two approaches similar to, but not exactly equivalent to svn:externals: Subtree merges insert the external project's code into a separate sub-directory within your repo. This has a detailed process to set up and the...

Due to external weird constraints I cannot modify the .gitignore of my repository. Is there a way to ignore files and directories other than modifying a .gitignore ? Even if it is a global solution like a global configuration that will be applied to all my repositories. ...

... The solution is very simple. git checkout <filename> tries to check out file from the index, and therefore fails on merge. What you need to do is (i.e. checkout a commit): To checkout your own version you can use one of: git checkout HEAD -- &...

I just enabled 2FA (I can't think of any other changes I made) and git asked for my username and password. I provided both, but they were "wrong". I tried many of the solutions here: Git push requires username and password but that didn't work. In particular, when switching from https to ssh, the ...

Is it able to show changed file name only with git log ? 6 Answers 6 ...

Is there any way to see why some file is getting ignored by git (i.e. which rule in a .gitignore file is causing the file to be ignored)? ...

I'm trying to do a git pull and I get the following error: 17 Answers 17 ...

...le, say pom.xml , from the master branch to an arbitrary older version in Git? 13 Answers ...

... If you get this message after doing a git pull remote branch, try following it up with a git fetch. (Optionally, run git fetch -p to prune deleted branches from the repo) Fetch seems to update the local representation of the remote branch, which doesn't necessar...

I have an existing git repo (a bare one) which has up to this point only been writable by me. I want to open it up to some UNIX user group, foo, so that all members of foo can push to it. I'm aware that I can easily set up a new git repo with: ...