0
votes
0answers
77 views

Git Extensions takes over 1.5 minutes to show a diff of a merge commit due to the diff with parent feature

Git Extensions diff is slow when looking at the diff of a merge commit between two branches that have significantly diverged due to the diff with parent being shown. The diff with parent was added a ...
2
votes
3answers
272 views

Single-user, multiple-computer versioning system

I have two computers (work and home) and wish to set up a version control system for source code and TeX documents. There are no collaborators (i.e., single-user/editor). Most of the source files are ...
6
votes
7answers
1k views

Automatic versioning upon file change (modify/create/delete)

I am looking for an implementation (on Linux) of a mechanism which would automatically and transparently version any changes in a directory (recursively). This is intended to be an addition (possibly ...
1
vote
1answer
979 views

Is there a way to use GitHub for Mac for GitHub remote and CLI for other remote?

The GitHub for Mac app says it'll only work with the Git origin remote. This means that it'll only work with one remote. My current remote is used to push to Heroku. Is there a way to set my origin ...
2
votes
1answer
72 views

Merge master functionality into shared branches in Git

Suppose that I have several shared branches on my Git repository, for example: newfeature, experiment and gtkgui, and I share those branches in the origin repository. My team and I make some changes ...
0
votes
6answers
365 views

Use SVN/GIT for Software Versioning history? Or something else?

I'm currently working on implementing a versioning infrastructure for our in-business applications. You know, V1.1, 1.2 etc for our apps. What I would like to do is have a simple setup of recording ...
0
votes
2answers
129 views

Bazaar merge identical files

I have two Bazaar (bzr) repositories that have very similar content. I'm trying to identify the differences and incrementally synchronize. My current strategy is to bzr add files to both repos and ...