peakpg / git-er-done Goto Github PK

Using basic Git, if you have a project that has one or more remote branches, you have to manually create a local tracking branch for each remote. Example:

$ git branch -a
* master
  remotes/origin/3.0-stable
  remotes/origin/3.1-stable
  remotes/origin/3.3.x
  remotes/origin/HEAD -> origin/master
  remotes/origin/master

This has 4 remote branches (master, 3.0-stable, 3.1-stable, 3.3.x). As per [this article](http://gitready.com/beginner/2009/03/09/remote-tracking-branches.html_To create a local branch, you need to do the following 4 times:

git branch --track 3.1-stable origin/3.1-stable

It would be nice if the tool could just do this automatically, like:

gd track-remotes

Could even ask questions of the user (to skip or rename local branches).

Depending on the entire rails stack for just one very simple command (git) is way overkill, especially since having multiple versions of rails installed can cause problems.

Remove the dependency.

1. While working in a feature branch, assume there are uncommitted changes along with several commits that would need to be squashed.
2. Run gd done
3. Don't save the commit (ie in Textmate, cancel the save)

Expected: An interactive rebase so I can squash the commit.
Actual: The rebase is aborted since there are uncommited changes. The commits are then merged into master.

Solution:
Abort the process if there are uncommitted changes. Remove the automatic commit in favor of just a check and then warning. (This might be preferable since the 'commit all' is probably overly greedy anyway.

Even if you only have a single commit in your feature branch, you still get the interactive rebase, even though its unnecessary.

Solution: Avoid interactive rebasing if only a single commit (or skip interactive rebasing all together and do a non-interactive squash)