Git tips from the trenches

#1

Post by ochronus » Sun, Feb 02, 2014, 2:24 PM UTC

Re: Git tips from the trenches

#2

Post by kbar13 » Sun, Feb 02, 2014, 4:52 PM UTC

> $ git branch --merged | xargs git branch -d

  does this actually work? `git branch --merged` for me also 
  returns '* master', which when xarg'd would include the '*'
  and also 'master'. I don't want to delete master, and I
  certainly dont want to delete * if it globs.

EDIT: made this into a code block as I have no idea how to make asterisks display.

Re: Git tips from the trenches

#3

Post by mef » Sun, Feb 02, 2014, 4:56 PM UTC

kbar13 wrote: post #2

> $ git branch --merged | xargs git branch -d does this actually work? `git branch --merged` for me also returns '* master', which when xarg'd would include the '*' and also 'master'. I don't want to delete master, and I certainly dont want to delete * if it globs. EDIT : made this into a code block as I have no idea how to make asterisks display.

It'll be fine, git will refuse to delete the branch you're on and the loop will continue:

error: Cannot delete the branch 'master' which you are currently on.

Re: Git tips from the trenches

#4

Post by ochronus » Sun, Feb 02, 2014, 5:06 PM UTC

kbar13 wrote: post #2

> $ git branch --merged | xargs git branch -d does this actually work? `git branch --merged` for me also returns '* master', which when xarg'd would include the '*' and also 'master'. I don't want to delete master, and I certainly dont want to delete * if it globs. EDIT : made this into a code block as I have no idea how to make asterisks display.

Yeah, didn't think about that, could be tricky if you're on another branch. Nice catch!

Re: Git tips from the trenches

#5

Post by cool-RR » Sun, Feb 02, 2014, 6:02 PM UTC

Worth it just for this:

    git rev-list --all | xargs git grep ''

Re: Git tips from the trenches

#6

Post by Roboprog » Sun, Feb 02, 2014, 6:18 PM UTC

I liked this one:

    git blame -w

Ignore the whitespace if a block was [un]indented, attribute to original author instead of person re-indenting due to control structure change around block.

Re: Git tips from the trenches

#7

Post by btbuildem » Sun, Feb 02, 2014, 6:26 PM UTC

I'd like to mention a feature that's been making my life oh so much easier:

  git bisect

If you're ever looking for "the commit that broke feature XYZ", git bisect is your trusty minion.

Re: Git tips from the trenches

#8

Post by [deleted] » Sun, Feb 02, 2014, 6:29 PM UTC

kbar13 wrote: post #2

> $ git branch --merged | xargs git branch -d does this actually work? `git branch --merged` for me also returns '* master', which when xarg'd would include the '*' and also 'master'. I don't want to delete master, and I certainly dont want to delete * if it globs. EDIT : made this into a code block as I have no idea how to make asterisks display.

[deleted]

Re: Git tips from the trenches

#9

Post by ochronus » Sun, Feb 02, 2014, 6:36 PM UTC

btbuildem wrote: post #7

I'd like to mention a feature that's been making my life oh so much easier: git bisect If you're ever looking for "the commit that broke feature XYZ", git bisect is your trusty minion.

https://ochronus.com/git-bisect-debug-with-git/

Re: Git tips from the trenches

#10

Post by icecreammatt » Sun, Feb 02, 2014, 6:49 PM UTC

kbar13 wrote: post #2

> $ git branch --merged | xargs git branch -d does this actually work? `git branch --merged` for me also returns '* master', which when xarg'd would include the '*' and also 'master'. I don't want to delete master, and I certainly dont want to delete * if it globs. EDIT : made this into a code block as I have no idea how to make asterisks display.

I have an alias that I have created that prevents the branch you are currently on or master from being deleted.

alias gclean='git remote prune origin; git branch --merged | grep -v -E "(\*|master)" | xargs -n 1 git branch -d'