popular version control and how it gets used on OS X and iOS

learn more… | top users | synonyms

0
votes
0answers
17 views

Git on FAT does not diff symbolic links

I store my git repo on FAT formatted external disk to use it on Windows and on OSX simultaneously. It is well know that FAT has no symbolic links, hence symbolic links on OSX are being converted to ...
0
votes
0answers
7 views

Disassociated custom icon files

I have a project with a number of folders using custom icons. When cloning or pulling the project via git, it turns the icon resource fork of each folder into a file called "Icon?" (where the ? stands ...
0
votes
1answer
19 views

Did I really Install GIT 2.0.1?

I'm following instructions from http://coolestguidesontheplanet.com/install-update-latest-version-git-mac-osx-10-9-mavericks/ But when I type in "git --version", I'm seeing: git version 1.8.4 ...
0
votes
0answers
13 views

Moved hard drive, getting 'illegal instruction: 4' errors

I gave my mac to an apple store for repairs.. Its a mid 2014 core i7 macbook pro. I did a backup using CCC, and now i'm running the backup on a Mac Mini 2011 Core i5. OSX runs fine, however any tool ...
2
votes
1answer
62 views

Setting up a git (ssh) server using OS X Server

I would like to use OS X Server to set up a git server that I can ssh into from other machines on my network. I realize that Xcode Service has repository functionality built in, but I am looking for ...
1
vote
1answer
27 views

Xcode gives .DS_Store conflict error

Me and my partner are using Xcode's built-in git to edit code together. When I tried to pull a change, I am having .DS_Store files conflict. We are both working on the storyboard and adding images ...
1
vote
1answer
58 views

“git commit -a” causes “subl -w: subl: command not found”

i am not sure what is causing this problem but i am having problems using git. It seems sublime is somehow interfering. Does perhaps anybody know how to solve this problem? I am running OSX 10.9.3. ...
0
votes
1answer
29 views

Git installation

I have installed git onto my Mac OSX v10.7.5 I have downloaded and double clicked the installer package I also ran the.sh for non-terminal programs When I try to run commands for git in the ...
0
votes
1answer
206 views

How to uninstall Git?

Anyone know how to uninstall Git? I would like to uninstall Git using the Uninstall.sh file that came in the git-2.0.1 install bundle. I am unable to find the Uninstall.sh file using Terminal. When ...
2
votes
1answer
112 views

Updating and running Git through Homebrew instead of XCode

On my new 2014 Mac (OS X 10.9 Mavericks), I have just installed Git using Homebrew. In order to install Homebrew, I had to download and install XCode 5. So now, when I enter the command which git, I ...
0
votes
1answer
38 views

Can OS X users get locked on OS X similar to on ubuntu when using git?

I have gitlab connected to my mac but when I do git push -u origin master I get 'Permission denied. Please try later' message which is what pops up when the user gets locked it seems. But here in ...
1
vote
1answer
97 views

How to run apple and custom git side-by-side

I have installed the Apple Developer Tools 5 on Mac OS X 10.9.4 which comes with Git: git version 1.8.5.2 (Apple Git-48) I also have installed Git 2.0.1 using the Mac OS X installer. How do I best ...
2
votes
2answers
560 views

Use downloaded Git instead of preinstalled Git

I am following the Lynda.com Git Essential Training. After he downloads and installs Git he enters which git and gets /usr/local/git/bin/git However when I do it I still get the preinstalled path ...
0
votes
1answer
428 views

How do I stop GitHub Conduit?

How do I stop GitHub Conduit and keep GitHub.app from reinstalling the job in launchd?
2
votes
2answers
384 views

Does Mac OS X's bash read scripts for all users (tab-completion scripts) from /opt/local/etc/bash_completion.d path?

I stumbled upon some instructions in the book "Pro Git" It suggests: Download this file : https://github.com/git/git/blob/master/contrib/completion/git-completion.bash If you use the Bash ...
4
votes
2answers
141 views

Homebrew - Upgrading software in /usr/bin

My OS X comes with a version of Git installed in /usr/bin. However, this version is older than the official stable one. I would like to upgrade it. Can I use Homebrew to upgrade this version? Or ...
1
vote
0answers
227 views

XCode commits/pushes code to GitHub but stays hooked on commit sheet

When I commit/push my code to GitHub through the XCode interface everything works fine. (Code is committed/pushed) but XCode doesn't seem to get that and wait for somethings. I have to cancel the ...
0
votes
0answers
356 views

Cannot find FileMerge (opendiff tool) but I have xcode 4.6 installed

When I attempt to run FileMerge as a GUI for Opendiff, I receive an error: $ git mergetool -t opendiff Merging: Gemfile Gemfile.lock ... Normal merge conflict for 'Gemfile': {local}: modified file ...
2
votes
3answers
74 views

Defining some global GIT settings to be automatically inherited

Sysnopsis Coming from a Linux background I still find Apples' modifications to the Unix hierarchy somewhat confusing. Nevertheless these subtle changes make it difficult for me to quickly do what I ...
7
votes
6answers
1k views

Completion for git commands

I recently switched from using an Ubuntu box for the last 7 years to a Mac. I have read other posts like Switching from Ubuntu to OS X and I'm lost and What is the difference between iTerm2 and ...
4
votes
1answer
396 views

Git not working over AFP

I've got a git repository on my file server which I'm connecting to via AFP. Whenever I try to do a git operation on the shared repository, such as staging a file, I get the following error message: ...
3
votes
3answers
1k views

Homebrew warning: “No developer tools installed” even though Xcode is installed

After installing Homebrew the "brew doctor" command returns: Warning: No developer tools installed. You should install the Command Line Tools. Run `xcode-select --install` to install them. …and I ...
4
votes
1answer
710 views

Can no longer ssh in to machine as git user after upgrading to Mavericks

I've got a server (just a mac mini) with two accounts: myRegularUser git (and some others) The git's home directory is in /Users/Shared/git. Since upgrading to Mavericks, I can't ssh into ...
2
votes
2answers
124 views

Sync between Mac & PC version control system

Having both a PC & Mac for work, I would like to synchronize development between both devices. I could just use Dropbox or Google Drive, but I would like to have version control (git or ...
1
vote
1answer
1k views

Does installing Command Line Tools for Xcode also install Git?

When I run git --version I get git version 1.7.12.4 (Apple Git-37), and it seems to be located at /usr/bin/git. I don't remember installing Git, but I did install Command Line Tools for Xcode in order ...
3
votes
1answer
2k views

How to Sync MacOS Applications + Preferences across multiple Macs without OS X Server?

Will the following work? If not, can someone propose better alternaives to solve this problem? Summary problem: I want to sync multiple MacBook Air's, Pro's and possibly Mini's with the same ...
2
votes
2answers
135 views

Add AppleScripts to Git repository

I have a few AppleScript files that I would like to share with the community on GitHub. The files are located in two distinct directories: ~/Library/Scripts ~/Library/Application ...
1
vote
1answer
504 views

How do I sync/merge my local Xcode git repository with a remote git repository?

I have an Xcode project with a local git repository. How do I set it up so that I can sync/merge my local repository with a remote repository that I have already created? I've tried going to the ...
0
votes
1answer
1k views

What is .git folder and can I delete it?

I used DaisyDisk to get info about my drive. I found a folder named ".git" in my documents. Its size is about 15 GB. what is it? and can I delete it?
1
vote
2answers
4k views

How do I work around a “Could not resolve host: (nil)…” error when installing/using Homebrew?

I'm trying to install Homebrew on OS X 10.8.4, and get the following: $ ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)" ==> This script will install: /usr/local/bin/brew ...
0
votes
1answer
112 views

changed user path and lost aliases in .bash_profile

I reinstalled mountain lion recently and had to reset my git path. Everything was working fine until I realised I had to do it for every project so I tried to change the default system path by sudo ...
2
votes
2answers
1k views

My Automator Workflow fails because it fails to find the git command within the 'Run Shell Script' command? Need help

I have an Automator workflow and one of the actions is to clone a repository. Here's the code for the 'Run Shell Script' action. The command is run within the Bash shell /bin/bash if that matters: ...
0
votes
2answers
104 views

resetting git path after clean install [duplicate]

I just reinstalled mountain lion and seem to have lost git in the process. I tried following this post : Why is Git not found after installing OS X Lion? but although I can cd into /usr/local/git I ...
19
votes
7answers
20k views

How to properly update git on mac?

I have installed the newest version of git (1.8.3) using homebrew but when I type git --version in my terminal, it prints: git version 1.7.10.2 (Apple Git-33) What should I do to replace the old ...
0
votes
1answer
118 views

git doesn't work anymore after moving user home to external drive

I've moved my users home directory from /Users/romeovs to /Volumes/DATA/home and ever since I get a git error. Whenever I use git clone or git init it replies: fatal: Failed to expand user dir in: ...
8
votes
1answer
398 views

How to show git files in Finder?

This may be too close to a duplicate for Git plug-in for Finder?, but I'm after a tool that will merely show me whether there is a repo in the current directory, and the state of the files within. I ...
4
votes
1answer
1k views

Git plug-in for Finder?

Is there a plug-in for the Finder which lets me see and do all my git-related stuff? It seems silly that I have to use different apps or the terminal for such things when the files are right there in ...
1
vote
0answers
1k views

A lot of problems with Homebrew

This is probably bad form for this board, and feel free to delete it if it is, but running brew doctor reveals the following: Warning: /usr/local/lib/pkgconfig isn't writable. This can happen if you ...
1
vote
0answers
67 views

Visual Git Software that Supports Network Repos

So I've tried out quite a few visual git tools (Tower, GitBox SourceTree), but the I'm running into trouble. On our developer environments, we don't clone into our local machines, we clone into our ...
7
votes
1answer
269 views

Does Mac OSX Mountain Lion autosave/versions interact badly with git?

I use git with some of my documents and wonder if the autosaved versions created by Mountain Lion could interfere (or even break) git versioning? This is important for me as I do not work on Macs ...
1
vote
2answers
476 views

How can I ssh mount an Ubuntu server's filesystem?

I posted this question on Stack Overflow, and the one response mentioned, "I guess from your mention of opendiff that you're using Mac OS. The recommended way to get sshfs on Mac OS used to be ...
0
votes
1answer
271 views

Git stopped working after installing both Github osx client and RailsInstaller

Perhaps it was due to some conflict but now when typing git I get a blank line, it doesn't say command not found, just goes to the next line If I press return, it exits, and does nothing How do I ...
6
votes
2answers
2k views

Show github notifications in Mountain Lion Notification Center

Simply put: Is there a way to show the notifications on github in the notification center of the new Mountain Lion?
1
vote
1answer
352 views

How can I do a code push to remote with gitx

I come from linux and gitg. That allows me to do the git pull and git push to the remote using the graphical gitg tool with a right-click option. However the gitx tool doesn't seem to have this ...
3
votes
1answer
1k views

Git clone error after OS X Mountain Lion update

I just updated my MBP to OSX 10.8 and am trying to start a new project with brunch.io which by default uses coffeescript and I prefer javascript so I need to clone the simple js skeleton. So something ...
5
votes
3answers
3k views

error: There was a problem with the editor 'vi' when using it with git

I have this strange problem with using vi as the editor for git commit -a. Normal flow is: I type git commit -a, vi appears, I enter my commit message, and then :wq to save & exit from vi. This ...
59
votes
3answers
23k views

git auto-complete for *branches* at the command line?

On my linux machine I have autocomplete for branches with git. For example I can type git checkout [TAB] and get a list of branches. Or I can type git checkout feb* [TAB] to get all branches that ...
2
votes
1answer
321 views

How can I specify a smaller block size for a Ramdisk?

I use a ramdisk to speed up a git repository with a lot (> 60k) of small (~200 bytes) files. Is there a way to create a ramdisk with a smaller block size?
2
votes
1answer
431 views

Is There a Coda 2 Plugin that does change highlighting for git / svn like netbeans has

In netbeans, it highlights changed lines of code in green, blue or red and lets you revert changes per line. Is there a plugin that enables this kind of feature in Coda 2?
7
votes
2answers
6k views

How do I rename a file in git that differs by case only?

In my git (Xcode) project, I committed a filename with improper case. Now I went to try to rename it, but when I commit, I get: fatal: Will not add file alias 'MyProject/MyFile.h' ...