2
votes
3answers
34 views

Version control (hg): can one directory be “synced” with different repositories?

I have a directory for my work files which is under version control (Mercurial): ~/myfiles In a subpath, I have a directory with Emacs packages for my org-mode setup: ~/myfiles/org-mode As I said, ...
0
votes
0answers
19 views

Use server git installation in GitHub for Windows

We are using Git as the version control for our website development. I work from a laptop, which is connected to the internal network via a WiFi connection. I've mapped the server drives as network ...
1
vote
2answers
66 views

How best to backup My Documents (maybe with Git?) [closed]

I would like a good process to backup My Documents on my hard drive periodically to an external hard drive or repository. I want to have a snap shot at each backup period, and don't want to waste ...
0
votes
2answers
93 views

Which version of Git to use with Windows

I wish to install Git on Windows 7. There appears to be two versions. I will be using it in conjunction with Tortoise Git. http://msysgit.github.io/ http://git-scm.com/downloads An answer on ...
0
votes
0answers
16 views

How to automatic add file names in git commit message?

When I am writing a commit, I usually have the format: filename: add something I want commit to automatically add filename into the commit message, is that possible? I know about commit templates, ...
0
votes
1answer
41 views

Using git with certificate in PHPStorm

When using PHPStorm, I want to integrate git in my project, but I can't seem to find the option where you specify the private putty key for the current project.. Any ideas?
2
votes
1answer
31 views

Get git-repository commit into different git-repository branch

Consider the following setup: One Repository1 sits on Bitbucket. A local working copy is situated on my machine. I change files locally, commit and push to Repository1. Changes in Repository1 (on ...
0
votes
0answers
40 views

Connect Dreamweawer CS6 to Bitbucket repository

I have a Git repository on Bitbucket and I would like to configure version control in Dreamweaver CS6. How do I do it?
0
votes
0answers
64 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 ...
0
votes
0answers
9 views

Conceal part of a git repository on the remote location

As I am beginning designing my own teaching material, I naturally started using git to keep track of changes and prevent unrecoverable data loss. So I have set up a big git repository with everything ...
0
votes
0answers
26 views

backup / version control hybrid scheme

Any suggestions for how to implement something that's about halfway between version control and a backup system? Specifics: I've been playing around with git and mercurial, and discovering that ...
1
vote
1answer
61 views

updating a macports installed program to the most recent revision

I general use macports to manage as much as I can---emacs, for example. Just now a fix was implemented in emacs for a bug that's been bothering me. Is it possible to incorporate the most recent ...
0
votes
1answer
245 views

Encrypt files before sending them to Cloud

Recently I switched to GIT along and picked bitbucket to host my code. Now with all the snowden scandal, I decided to review my choices. I really don't want to host my data on my own server, I'd ...
2
votes
1answer
519 views

Rebasing a branch which is public

I'm failing to understand how to use git-rebase, and I consider the following example. Let's start a repository in ~/tmp/repo: $ git init Then add a file foo $ echo "hello world" > foo which ...
2
votes
1answer
98 views

Update the remote of a git branch after name changing

Consider the following situation. A remote repository has two branches master and b1. In addition it has two clones repo1 and repo2 and both have b1 checked out. At some point, in repo1 the name of b1 ...
0
votes
2answers
92 views

Pulling changes into remote tracking feature branch while keeping simple branching workflow

We're a team of a couple of developers that have our master branch and develop features in feature branches. We branch release branches of master when we release. All bug fixes are made in master and ...
1
vote
1answer
670 views

Configure Git to use Beyond Compare for image diff

Because we work with a number of sprites, the kind of specialised diff views provided by Beyond Compare would be ideal to see which one of 2 versions I'm after when conflicts arise. I've already ...
0
votes
1answer
40 views

How should i separate branches for live project in git

Initially i was in a team where we have one project and all other have separate bracnhes. I didn't knew much git but picked up in small time just doing basic things. Now all other members have moved ...
0
votes
0answers
77 views

Issue committing files using GitHub app

I've been using the GitHub app for a while now, and recently it's given me some problems. My most recent problem has me up the wall. Here's what happened. I noticed that some of my files were messed ...
0
votes
1answer
62 views

GIT Permissions

There is something not clear for me and this is how to prevent other people read my code. The thing is that I want people create their own branches but not to view the other's branches. If someone is ...
0
votes
2answers
52 views

Version control options for research project [closed]

Good day. I know that we're supposed to ask questions that can be answered and not just discussed, so I'll try to make my question quantifiable, even though it's not completely so in nature. I'm ...
2
votes
3answers
134 views

Is there a git GUI for people who don't even know what git is? [closed]

I have set some of my clients up with Sparkleshare for shared documents, to avoid overly complex solutions like Alfresco etc. At the moment, accessing old versions of files requires me to get it for ...
0
votes
2answers
60 views

Working with Git and remote repositories

I've been asked to work with a Github repository and the only Git related procedure I've ever done is cloning an existing repository. I've worked with SVN alot but I'm a bit of a noob when it comes ...
0
votes
2answers
581 views

How do I install git 1.8.3 on mac OSX?

I want to use the new git submodule deinit command added with 1.8.3. Can someone give me step-by-step instructions on how to install and use the development version of git on mac OSX 10.7.5? The ...
0
votes
1answer
338 views

git difftool doesn't launch Beyond Compare from Powershell or command prompt

I'm trying to use Beyond Compare 3 as my diff tool with git. I configured git with the following commands: (source: Using Beyond Compare With Version Control Systems) git config --global diff.tool ...
0
votes
2answers
61 views

How can I synchronise web projects at home and work?

I am currently developing 10 websites for my job. I use codeIgniter PHP framework for each one. I develop both at home (localhost) and work (localhost) and upload changes to the server. My current ...
0
votes
0answers
35 views

Is there a way to make TextMate remember its state when switching branches?

I'm looking for a plugin or bundle which enables TextMate to bind it's state to the current branch. By state I mean open tabs and open folders in the project drawer. Here is my scenario: working on ...
0
votes
2answers
26 views

Setting up ssh in git

I am trying to setup git ssh client on my windows PC. I was logged in to the PC as a domain user and I installed git and set up the ssh client through the domain user account which I was logged in. My ...
3
votes
4answers
348 views

How to version control for a solo author creating non-programming documents?

I'm a writer, not a programmer. I'm just now for the first time learning about version control and how it works, and I am wondering how version control could streamline my workflow. For years, I've ...
3
votes
1answer
170 views

Git vs SVN: website storage efficiency [closed]

I know that SVN (Subversion) stores files' deltas in order to efficiently store data. Git however, is a little more complex. What I'm wondering is that if I were to store plain HTML, image and js ...
0
votes
1answer
216 views

Git repository on external disk?

I am setting up git server on linux Debian and I want for all of my repositories to be saved on external disk (usb disk drive). How can I acomplished that?
1
vote
2answers
145 views

How can I reliably synch local source files with a remote?

I'm developing locally on a mac running MAMP and BBEdit. I'm currently using Transmit to synch files by (S)FTP. I like the software and it has a "synch" feature to compare local files to remote either ...
0
votes
1answer
259 views

Cygwin - Repo with Separate Git/Working Dir Doesn't Work

Since I've switched to OS X and Vim, I've found it easiest to manage all of my 'dotfiles' (all of my configuration files and miscellaneous scripts) with Git. Having already set up my dotfiles in a ...
1
vote
2answers
975 views

using git for media libraries

Rationale: I want to manage libraries of media files (music, images) using git, there is git-annex but it requires haskel platform - but they do not play together well (also it's quite to big ...
2
votes
2answers
2k views

Git doesn't observe new exceptions in .gitignore

[NOTE: This is not the usual "Git still tracks files I just added to .gitignore!" problem. This is the opposite of that.] I have a website's full directory structure in a Git repository. The CMS I ...
0
votes
1answer
118 views

How do you use a VCS (preferably git) to synchronize local directories?

I'd like to have a simple, script-like backup solution to synchronize 2 local directories which provides a "fail-safe"-mechanism allowing to undo 1 commited unwanted modification of a file that got ...
0
votes
2answers
90 views

How to check if bzr “Tree is up to date” ? (to only build when necessary)

I'm setting up a script to download, build and install a big project (that uses bazaar) and want to trigger the build process only if the "bzr update" does NOT return "Tree is up to date at revision ...
1
vote
0answers
161 views

Git differences between OSX and Linux

This has been driving me somewhat insane but I can't find any information on it. I have both Mac and a Linux (Ubuntu) machines. I work on both but I'm finding Git is behaving very differently during ...
1
vote
1answer
278 views

Version Control for Eclipse that's like Xcode 4's version control?

I really enjoy Xcode 4's version control with git. It's all very simple and intuitive and enables me to be extremely productive. If I modify a file, a little 'M' pops up next to the file and all I ...
0
votes
1answer
375 views

git init --bare permission denied on 16gb USB stick

I am using GIT on a Windows 7 machine (64 bit) and have been learning how to use GIT to version control my files. Now I want to be able to create a --bare repository on an external device (in this ...
1
vote
2answers
247 views

Saving Git remotes inside the Git repository itself?

I have a few projects under version control using Git. Since it is a distributed version control system, it is very easy to have it hosted at multiple places (GitHub, Bitbucket, Google Code, etc.) ...
3
votes
1answer
303 views

.gitignoring pdf file only when a tex source is present

I'd like to set up a global .gitignore file in my home suitable for working with TeX files. So typical TeX junk files such as *.log, *.aux, *.synctex.gz would go in it. The next step, however, is ...
2
votes
1answer
83 views

Git keeps forgetting the current directory

I've got a git repository, call it myscripts/. Within myscripts/ are subdirectories perl/, python/, and ruby/. For some reason, when I edit code in one of the subdirectories, Git forgets that the ...
11
votes
1answer
1k views

How can I selectively disable zsh's version control integration when my CWD is on a remote filesystem?

I'm running zsh on OSX and on occasion I have to work on a mounted sshfs volume. However, git is REALLY slow over sshfs mounts. My prompt makes use of the vc mode stuff that zsh provides built in, but ...
2
votes
2answers
365 views

How to keep a clone of GIT updated?

I have created a GIT clone on my backup NAS: git clone --bare //NAS/GIT/TexRepo //backupnas/backup/GIT/TexRepo.git Now, continuing to work on the regular repository, what is the best way, practice ...
0
votes
1answer
1k views

How to use Git Extensions with BitBucket/Mercurial repository?

I a have repository on both github.com and bitbucket.org, and I am very familiar with using Git Extensions for all repository functions on GitHub. When I started using bitbucket.org repo's I have to ...
1
vote
1answer
963 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 ...
0
votes
2answers
123 views

Do dVCS/git systems also manage incremental file changes

... or do they only manage full "commits"? (by full commits, I mean to say only the working/final files for a given snapshot.) I am needing to learn some kind of VCS as I venture into application ...
1
vote
1answer
738 views

Git pull/fetch doesn't seem to work

I am using git over hamachi vpn and am able to clone the remote repository. However, git pull/fetch fails after hanging for a long time. The error message displayed is: Write failed: Broken pipe ...
2
votes
1answer
70 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 ...