Blog

Category Filtering: 'git'

Remove Filter


git: Remove remote branch

Posted by Luis Majano
29 Mar 2011 09:29 PM
This is something I want to blog in order to save it for posterity so I don’t go crazy looking for this. I have a remote branch I committed but I need to remove it for whatever reason, how do I do this with git?

You do this in two easy steps:
  1. Remove the local branch either through your favorite GUI or via: git branch -d “branch name”
  2. Push the removed branch to the remote origin: git push origin :refs/heads/”branch name”

The key here is that you push a non-existent branch, so it basically removes it from the remote repository. That’s it!

Git: Remove a remote tag

Posted by Luis Majano
08 Feb 2011 11:14 AM
This is something I want to blog in order to save it for posterity so I don't go crazy looking for this.  I have a remote tag I committed but I need to remove it for whatever reason, how do I do this with git?

You do this in two easy steps:

  1. Remove the local tag either through your favorite GUI or via: git tag -d "tag name"
  2. Push the removed tag to the remote origin: git push origin :refs/tags/"tag name"
The key here is that you push a non-existent tag, so it basically removes it from the remote repository.  That's it!

Awesome Git client for Mac: Tower

Posted by Luis Majano
04 Jan 2011 11:40 AM
I am a huge fan of development tools as I am also a tool developer myself.  One tool that has been lacking in my arsenal was an awesome Git client for Mac, as Mac is my main development environment.  I, like any true geeky developer, love the console, however, there is something about having a UI that gives me a warm warm feeling.  I have used the eGit plugin for Eclipse and although it is usable, it is still quirky as it is still constantly in development.  No disrespect for the developers, but this project is still moving forward and I know it will be a great great plugin and most likely I will use it hands down as my unique git client as it is embedded in Eclipse/CFBuilder.



However, I recently have experienced two great git clients: SmartGit and Tower.  SmartGit is java and cross platform.  It is very very good, but its aesthetics are well, java like and not sparkly like Tower.  Tower is Mac only and it truly shines as a Mac application.  I have really like the inbox style approach where I can move between tags, remotes, branches and stashes.  Nice double click and I have switched branches!  I can even right click on a branch and publish it or pull, refresh, etc.  The graphical history is very very nice and you can even change it to a more github like commit view.

Overall, I would say SmartGit and Tower are two of my favorite git clients.  So give them a shot, it will truly change your outlook on the Git tools landscape.

Git Help? How to build a patch from commits

Posted by Luis Majano
15 Nov 2010 10:45 AM

 

This is more of a question post than a learning post, so your feedback is welcomed.  Here is what I am trying to do.  I have several commits into a branch and I would like to build a patch file that has all the files that where changed from commit X to commit Y.  Example:

 

Commit 1 – Changed files

/plugins/BeanFactory.cfc
/interceptors/SES.cfc

Commit 2 – Changed files

/interceptors/SES.cfc
/interceptors/Security.cfc

Commit 3 – Changed files

/web/services/PluginService.cfc

 

Now I want to run SOMETHING or do SOMETHING automated that can produce the following patch:

PATCH

/plugins/BeanFactory.cfc
/interceptors/SES.cfc
/interceptors/Security.cfc
/web/services/PluginService.cfc

 

So any Git gurus can comment on how to achieve this.

Enterprise Architect ColdFusion Generation Templates Released

Posted by Luis Majano
31 Aug 2010 02:35 PM
I have used Sparx System Enterprise Architect for almost 4 years now and absolutely love working with it for UML design and also for ColdFusion code stub generation.  The only problem with EA is that it has to run on windows, sorry but I hate windows, but anyways.  I am finally opening my templates to the world so I can get more collaboration on them.  I took a project from Mike Ranklin I believe and updated lots of the source to make it work with ColdFusion 9 script syntax and also ORM entities. 

It is really great to have a great UML model and stub out our ORM entities out of it.  So if you are interested, the project is here and help out.

Github Fever

Posted by Luis Majano
24 Aug 2010 08:46 AM

As you might have noticed from the ColdBox migrations, we are moving to github.  I took the decision to migrate our source code over for several reasons that you git fans might already know.  However, not only did I move because of the version control system, but because it allows for easier community involvement in the projects.  This to me was key.  So instead of tons of headaches with SVN patches, just fork the dang thing, patch it and send me a request.  So hopefully, this will allow for more community involvements. 

I am also moving my personal projects to github and you can find them on my personal space.

Site Updates

Entries Search