mckeed / swigit Goto Github PK

These are just my git scripts that I've come up with over the years to make things easier and to remind me how to do stuff that I'm always forgetting.

It's old, so some of this might have been already added to git core, let me know.

The ones I use frequently:

git-simpull is my usual method of pulling from origin – I have it symlinked as git up.

It does a stash, then a pull --rebase, then a stash pop (if everything goes well).

If the rebase fails, you still have to handle it yourself. I'd like to add some kind of intelligence to be able to run this again to clean up after itself, but for now, you can use git recon to continue the rebase and apply the stash.

This is a compact form of git log that I prefer because it doesn't take over my whole terminal window with a bunch of irrelevant stuff.

You can do

git list 30

to show 30 commits if you need a longer list, and

git list brunch

to list the brunch branch, or some other rev.

I make a .mailmap file for each of my repos that abbreviates all the contributors names to a standand number of characters, 4 or 5 (using nbsp  as padding). This keeps the output of git-list nice and columnar.

I alias this as git a and use it instead of add. I got tired of adding each file individually and following up with git status to check my work, so git a adds all of its arguments with the --all option and then does a git status.

Did you forget to commit yesterday and want your git record to show when you actually did this work?

git timewarp 15 hours ago

will make a commit with a modified timestamp. Magic.