DZone Snippets: git code

Getting git pull to work for new repos in GitHub

whomwah (Duncan Robertson) — Mon, 30 Jun 2008 08:43:14 GMT

When creating a new repos in GitHub, I sometimes what to have 2 master branches on different machines to work on, and to use the version on GitHub as my root. In order to keep my 2 branches in sync I would run 'git pull', but out of the box on gitHub this spews out a message asking for more information. Adding the lines below should make it work again as expected.



git config branch.master.remote origin

git config branch.master.merge refs/heads/master

new git repo

lorenb (Loren Brichter) — Sun, 29 Jun 2008 03:12:15 GMT

// setup new git repo



cd ~/repo/

git clone –bare ~/projects/myprojectname myprojectname.git

touch myprojectname.git/git-daemon-export-ok

cd myprojectname.git

git –bare update-server-info

# post-update executes everytime there is a push to this public repository;

# it executes an update-server-info by default.

chmod a+x hooks/post-update



cd ~

rsync -av ~/repo username@webhost.example.com:~/git/

Remove Deleted Files From Git

mattgrayson (Matt) — Wed, 18 Jun 2008 20:33:20 GMT

// Via http://www.jamesrobey.com/bash-script-to-remove-deleted-files-from-git/



for i in `git status | grep deleted | awk '{print $3}'`; do git rm $i; done

Adding new files to your github repository

jrobertson (James Robertson) — Tue, 25 Mar 2008 15:16:15 GMT

Here is a set of instructions to apply new files to my github repository which is called projectx.

Before you start make sure you don't already have the repository name listed as a directory in the local current directory.

1) copy the remote repository to your local machine
syntax: git clone [uri] # eg. git clone git@github.com:jrobertson/projectx.git
1.5) cd into the newly created local repository eg.cd projectx
2) copy the local file to the local repository directory
eg. cp ../projectx2/feed.rb .
3) add the local files to the local repository
syntax: git add [file] # eg. git add feed.rb
4) Inform the git system that you have completed the required changes for this session.
git commit -a # add a message associated with this file revision
5) copy the new local repository files back to the remote repository.
git push # updates the changes back to the server
Note: The text with the square-brackets should be replaced with your own values.

Reference: A tour of git: the basics [cworth.org]

rake task to rename views to rails 2.0 format

caffo () — Thu, 20 Mar 2008 03:11:00 GMT

// This task will rename your files to the rails 2.0 format, using git mv. Add it to /lib/tasks/rails.rake



namespace 'views' do

  desc 'Renames all .rhtml views to .html.erb, .rjs to .js.rjs, .rxml to .xml.builder, and .haml to .html.haml'

  task 'rename' do

    Dir.glob('app/views/**/[^_]*.rhtml').each do |file|

      puts `git mv #{file} #{file.gsub(/\.rhtml$/, '.html.erb')}`

    end



    Dir.glob('app/views/**/[^_]*.rxml').each do |file|

      puts `git mv #{file} #{file.gsub(/\.rxml$/, '.xml.builder')}`

    end



    Dir.glob('app/views/**/[^_]*.rjs').each do |file|

      puts `git mv #{file} #{file.gsub(/\.rjs$/, '.js.rjs')}`

    end

    Dir.glob('app/views/**/[^_]*.haml').each do |file|

      puts `git mv #{file} #{file.gsub(/\.haml$/, '.html.haml')}`

    end

  end

end

overwrite heroku code with an alien git repository

caffo () — Tue, 18 Mar 2008 06:15:51 GMT

// Use this command in your repos directory to push to your heroku repos. Useful for github / heroku sync.



git push -v -f git@heroku.com:.git

Alias to a Nice Default Gitk

justinwr (Justin R) — Thu, 17 Jan 2008 04:44:18 GMT

Just a really quick and easy shell alias for my preferred defaults for Git's repository and branch viewer, Gitk.

This runs "gitk"...
...including all branches,
...outputting errors to the black hole,
...and any extra command-line arguments.



# Run like this

# gitk --since="2 days ago" &



alias gitk="gitk --all $1 2>/dev/null"

Git-diff last two commits through TextMate

justinwr (Justin R) — Sun, 09 Dec 2007 04:52:30 GMT

I believe this is how svn diff operates... but anyway, this alias will allow you to diff the last two commits in Git through TextMate. If you have a theme that supports Diff's then you'll see the differences clearly. Remove the last pipe statement (the mate part) to expose your diff in the console.



alias gitdiff='git log|grep commit|cut -d " " -f2|head -n 2|xargs -n 2 git diff -R|mate'

Checkout a Git clone of an SVN repository in parent folder

nicwilliams (Dr Nic Williams) — Thu, 22 Nov 2007 22:35:30 GMT

Here is a quick executable cmd that you run inside a folder checked out with Subversion. It will clone the repository using Git into the parent folder as <projname>.git

Stick this code into ~/bin/gitify and add ~/bin to your path:



#!/usr/bin/env ruby -wKU



# get svn info location

svnurl = `svn info | grep "^URL:"`.gsub('URL: ','').chomp



# project = basename

project = File.basename(Dir.pwd)



puts cmd = "git-svn clone #{svnurl} ../#{project}.git"



`#{cmd}`