tagged [version-control]
What equivalents are there to TortoiseSVN, on Mac OSX?
What equivalents are there to TortoiseSVN, on Mac OSX? I am using a MacBook Pro running Mac OS X 10.5. I am new to this development environment, and previously worked on Windows. I find there is no To...
- Modified
- 24 Jun at 00:2
Git clone without .git directory
Git clone without .git directory Is there a flag to pass to `git` when doing a clone, say don't clone the `.git` directory? If not, how about a flag to delete the `.git` directory after the clone?
- Modified
- 13 May at 23:31
What's the difference between git reset --mixed, --soft, and --hard?
What's the difference between git reset --mixed, --soft, and --hard? I'm looking to split a commit up and not sure which reset option to use. I was looking at the page [In plain English, what does "gi...
- Modified
- 18 Mar at 10:2
How to convert a normal Git repository to a bare one?
How to convert a normal Git repository to a bare one? How can I convert a 'normal' Git repository to a bare one? The main difference seems to be: - in the normal Git repository, you have a `.git` fold...
- Modified
- 23 Feb at 09:49
Should I check the dotnet-tools .config directory into source control?
Should I check the dotnet-tools .config directory into source control? Recently I've noticed a `.config` directory being created by Visual Studio with a `dotnet-tools.json` file in. Should this be `.g...
- Modified
- 11 Feb at 17:14
Git: How to squash all commits on branch
Git: How to squash all commits on branch I make new branch from `master` with: I make 20 commits into it. Now I want to squash those 20 commits. I do that with: What about if I don't know how many com...
- Modified
- 19 Dec at 17:22
Undo git pull, how to bring repos to old state
Undo git pull, how to bring repos to old state Is there any way to revert or undo git pull so that my source/repos will come to old state that was before doing git pull ? I want to do this because it ...
- Modified
- 5 Dec at 17:42
How to list branches that contain a given commit?
How to list branches that contain a given commit? How can I query git to find out which branches contain a given commit? `gitk` will usually list the branches, unless there are too many, in which case...
- Modified
- 30 Oct at 08:46
Getting Git to work with a proxy server - fails with "Request timed out"
Getting Git to work with a proxy server - fails with "Request timed out" How do I get Git to use a proxy server? I need to check out code from a Git server, but it shows "Request timed out" every time...
- Modified
- 23 Oct at 23:9
Do I need to maintain ReSharper's dotsettings.user file in Source Control?
Do I need to maintain ReSharper's dotsettings.user file in Source Control? I noticed ReSharper has created a `dotsettings.user` in my Source folder. ![file.sln.dotSettings.user](https://i.stack.imgur....
- Modified
- 22 Oct at 22:17
What is a tracking branch?
What is a tracking branch? Can someone explain a "tracking branch" as it applies to git? Here's the definition from [git-scm.com](https://git-scm.com/book/en/v2/Git-Branching-Remote-Branches): > A 'tr...
- Modified
- 6 Jul at 02:8
Definition of "downstream" and "upstream"
Definition of "downstream" and "upstream" I've started playing with Git and have come across the terms "upstream" and "downstream". I've seen these before but never understood them fully. What do thes...
- Modified
- 7 Jun at 14:17
Which c# project files should I version control?
Which c# project files should I version control? I have a project I'm looking to manually manage via perforce version control as I only have the Express edition. What I'm looking for is which files sh...
- Modified
- 1 Mar at 17:42
Should I add the Visual Studio .suo and .user files to source control?
Should I add the Visual Studio .suo and .user files to source control? Visual Studio solutions contain two types of hidden user files. One is the solution `.suo` file which is a binary file. The other...
- Modified
- 16 Feb at 18:26
How does Git handle symbolic links?
How does Git handle symbolic links? If I have a file or directory that is a symbolic link and I commit it to a Git repository, what happens to it? I would assume that it leaves it as a symbolic link u...
- Modified
- 27 Oct at 10:1
How can I stop .gitignore from appearing in the list of untracked files?
How can I stop .gitignore from appearing in the list of untracked files? I just did a `git init` on the root of my new project. Then I created a `.gitignore` file. Now, when I type `git status`, file ...
- Modified
- 16 Oct at 09:13
Git workflow and rebase vs merge questions
Git workflow and rebase vs merge questions I've been using Git now for a couple of months on a project with one other developer. I have several years of experience with [SVN](http://en.wikipedia.org/w...
- Modified
- 3 Oct at 16:10
How to use Git for Unity3D source control?
How to use Git for Unity3D source control? What are best practices for using [Git](http://en.wikipedia.org/wiki/Git_%28software%29) source control with Unity 3D, particularly in dealing with the binar...
- Modified
- 9 Jun at 21:55
Ignore files that have already been committed to a Git repository
Ignore files that have already been committed to a Git repository I have an already initialized Git repository that I added a `.gitignore` file to. How can I refresh the file index so the files I want...
- Modified
- 25 May at 23:17
FileVersionInfo and AssemblyInfo
FileVersionInfo and AssemblyInfo Given this snippet from Blah.dll's AssemblyInfo.cs: And then in a separate .exe: Other SO questions show ProductVersion being "correct",
- Modified
- 20 Apr at 08:57
What's the best three-way merge tool?
What's the best three-way merge tool? Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the "base" revision) and support graphical tools to resolve conflicts....
- Modified
- 4 Mar at 08:23
Undo working copy modifications of one file in Git?
Undo working copy modifications of one file in Git? After the last commit, I modified a bunch of files in my working copy, but I want to undo the changes to one of those files, as in reset it to the s...
- Modified
- 11 Jan at 10:49
Git undo changes in some files
Git undo changes in some files While coding I added print statements into some files to keep track of what was going on. When I am done, is it possible to revert changes in some files, but commit the ...
- Modified
- 11 Jan at 10:48
How do I migrate an SVN repository with history to a new Git repository?
How do I migrate an SVN repository with history to a new Git repository? I read the Git manual, FAQ, Git - SVN crash course, etc. and they all explain this and that, but nowhere can you find a simple ...
- Modified
- 7 Dec at 14:40
git-upload-pack: command not found, when cloning remote Git repo
git-upload-pack: command not found, when cloning remote Git repo I have been using git to keep two copies of my project in sync, one is my local box, the other the test server. This is an issue which ...
- Modified
- 22 Sep at 13:55