filp@filp-x ~/dev/myproject > $ git status ## master A mock.psd filp@filp-x ~/dev/myproject > $ git commit -m “Add mock.psd” psdiff: created mock.psd.png # <———- [master 1156ea5] Add mock.psd 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 1.psd create mode 100644 1.psd.png If you have Photoshop psd files lying around your git repository, you …
Tag Archives: git
Making ‘git rebase’ Safe on OS X
When performing a large rebase with several commits and many changed files on OS X 10.7+, the rebase process can randomly abort, stating that there are uncommitted changes and rebase cannot continue. However, a git status does not report any changes. Fix is to set core.trustctime to false. Run the command below to do so: …
gitdown – don’t commit when you’re drunk
dploy.io
Autocomplete git branch name
Turns out it’s possible to enable autocompletion of git branch names when working on the command line. The script can be automatically installed on OS X using these commands: $ curl -G https://raw.github.com/git/git/master/contrib/completion/git-completion.bash > ~/.git-completion.sh $ echo ‘source ~/.git-completion.sh’ >> ~/.bash_profile Don’t forget to re-open any already open Terminal windows. (via @decthomas) UPDATE: I’ve been …
Recommended SublimeText Plugin: GitGutter
On the path with git-flow
Read a lot about Vincent Driessen’s Git braching model, but couldn’t quite wrap my head around it. This video, which introduced git-flow — a collection of Git extensions to provide that branching model — to me, finally made it all clear. Above that, the people who created Sourcetree, have implemented it in their app and …
Automatic Website Publishing with git-ftp.py on Mac OS X
On a recent project I collaborated on, deployment happened via git-ftp.py, a Python script which automatically publishes your git repository to an FTP server. The script itself works with with an git-rev.txt file on the FTP server which keeps track of the last published commit. When deploying via git-ftp.py, the script only uploads the changes …
Continue reading “Automatic Website Publishing with git-ftp.py on Mac OS X”
lolcommits
Takes a snapshot with your Mac’s built-in iSight/FaceTime webcam every time you git commit code, and archives a lolcat style image with it. UPDATE 2017.01.03: Jelle Vandebeeck has written down some instructions on setting this up. Since this was originally posted, lolcommits now apparently supports recording video (yielding a gif) 🙂 lolcommits →
Automatic website publishing with Git, GitHub-Style
One of the things I like about GitHub is the fact that it sports a gh-pages branch. Anything you push to it, is automatically published on your GitHub subdomain http://username.github.com/projectname/. Inspired by this GitHub publishing flow, I’ve set up a likewise method on our web servers at work: a branch which gets published automatically onto …
Continue reading “Automatic website publishing with Git, GitHub-Style”