Here’s how to check what’s changed in your local Git repo vs the master repo.
Git Status tells you what file has changed, but not to the level of detail such as what lines or what code was changed.
git diff HEAD |
Git Diff Head
Git
Storing Git Credentials
There are two ways to store git credentials. One is temporary and the other permanent. You can store your git credentials unencrypted on disk forever or in cache memory temporarily.
Temporary. Store for 15 minutes.
git config credential.helper 'cache --timeout=900' |
Permanent.
git config credential.helper store git push http://example.com/repo.git Username: <type your username> Password: <type your password> |
Next time you use git, you will not be prompted for a password.
Gitlab Community Edition
Git is the most popular version control software for managing your code. If you’re looking for the best version control system out there, Git is the pretty much the de-facto standard of version control. Although you can run Git locally without a server, you’ll need some kind of repository to share your code with others.
Enter Github. Github provide free and paid Git repositories. Github public repositories are free, while private ones require subscription. For $7 dollars a month, you can have up to 5 private repositories. For $50 per month, you can use up to 50 repositories.
If you want to run your own Git repository either on the cloud or on your own private network (it’s more secure this way), then you’ll need to look at Gitlab’s Community Edition (Github.com is proprietary). Gitlab requires that you install their software on a Linux server (I’m using Ubuntu Server).
I tried running Gitlab CE on the cheapest server ($5 per month) I can find at Digital Ocean. It works but, it’s painfully slow. I don’t recommend it. The $5 per month server only has 1 CPU core and 512 MB of RAM. I recommend that you go for a system that has 2 CPU cores and 2GB of RAM. This system will cost $20 per month.
By the way, if you don’t want managing your own server, you can simply sign up with Gitlab.com. It’s free! They offer unlimited private and public repositories up to 10GB of disk space per project. Of course, Gitlab has other products. For a paid subscription you can get enterprise support and more advanced features.
Visit Gitlab for more details.
Remove Sensitive Info From Github
I made a mistake by publishing my database password to an environment file that’s visible. Rookie mistake. Replacing the database password entry with something else and submitting kinda takes care of the problem, but anyone can still view the history of the file and see your password. One way of getting rid of this, if you don’t really care about the history of your submits, is to reinitialize the project back to the initial commit. Here’s how.
// Clone the project to your local computer $ git clone https://github.com/name/myproject.git // go to your project directory $ cd myproject // delete the .git folder where all the history is kept $ rm -rf .git // reinitialize your repository $ git init // add Github url $ git remote add origin https://github.com/name/myproject.git // verify remote $ git remote -v // Add all files and commit the changes $ git add --all $ git commit -am 'initial commit' // Finally, push to the origin server which is Github $ git push -f origin master |
Your sensitive data is now gone from history. Just be careful next time.
Setup New Repository on GitHub
The following instructions will create a new repository on GitHub. These instructions will assume that you’re logged in to GitHub.com. You can create a new repository by clicking on the link called “create a new repository” found on several pages on GitHub. You can also go directly to this URL: https://github.com/new.
You need to provide a repository name that’s hopefully short and memorable. Click the “Create Repository” button to start the initiation process. Once the repository is created, you can create a new local repository on your computer and sync it to GitHub repository.
On your computer:
echo "# RepositoryName" >> README.md git init git add README.md git commit -m "first commit" git remote add origin https://github.com/ulyssesr/RepositoryName.git git push -u origin master |
If you have an existing local repository, you can push it to GitHub.
git remote add origin https://github.com/ulyssesr/RepositoryName.git git push -u origin master |
Gitignore
You can ignore specific files in Git by placing a .gitignore file at the root of your local repository. The files listed in .gitignore will not be tracked by Git. Why would you do this? Well, there are certain OS generated files placed in system folders such as .DS_Store or Thumbs.db that are not really part of your code.
Create a .gitignore file
touch .gitignore |
Edit the .gitignore file
sudo nano .gitignore |
Add the files you want excluded. You can use wildcards.
.DS_Store Thumbs.db *.log |
Commit and Push
git commit -m "adding .gitignore file" -a git push |
That should do it!
Github for Mac
GitHub has a native for the Mac OS called “Github Mac.” You can download the app directly from GitHub. With this native app, you can clone, and fork a repository. You can commit your changes to the local or remote repository. Github for Mac is fairly intuitive. I didn’t need to read the manual to perform version control tasks.
In addition, you can also browse history, switch branches and synchronize your changes to the master repository. The application was designed using Chameleon, a port of Apple’s UIKit for iOS. The interface is well-designed and integrates well with the GitHub repositories. Synchronization seems to be snappy and quite fast. Overall, it’s a fast and snappy application. Most of all, it’s free.
Xcode Reinstall on Mavericks
I’ve been using Mac OS 10.9 Mavericks for a couple of weeks now. So far, so good. No issues whatsoever. There were several updates that followed the OS upgrade. Updates to iTunes, iMovie, iPhoto were the obvious ones, plus a couple of other small applications that were also updated as a result of the OS upgrade.
I happen to use Git for version control for my software projects. One thing I noticed after upgrading to Mavericks, Git stopped working completely. I tried to do a git pull, and I was met with this error, “xcode-select: note: no developer tools were found at ‘/Applications/Xcode.app’, requesting install. Choose an option in the dialog to download the command line developer tools.”
The cool part about all this is, Mavericks immediately recognized the problem and offered to correct it by asking the user to proceed with Xcode installation. I gladly clicked Update/Install. The update took less than 5 minutes to complete. After the install, I issued git pull command again, and sure enough the my git repository updated nicely.
I’m glad to report that after two weeks running on Mac OS Mavericks, I haven’t had any major problems, except for this relatively minor inconvenience of reinstalling Xcode.
Git Export
Subversion has an export command when you want a copy of the repository without the .svn directories and files. Git Export is similar to Subversion’s Export command. To export a project in Git, you will need to go to the root of your Git project and issue the following commands.
cd git/project |
Create a gzip file or a zip file.
git archive master | gzip > project.tgz |
or
git archive master | zip > project.zip |
Git Commit
Git Commit is a command for committing files to the local repository. Once satisfied with the changes in the local repository, the files will need to be committed. This command does not update the master repository in Github. Just the local repository. You commit files to the local repository by issuing this command in the Terminal.
git commit -m “your comments go here” -a |