Marcus Shepherd marcusshepp

git grep foo

The main advantage of git grep is that it can find the patterns in the git repository, i. e. also in others than the current version of the source. This cannot be done using the standard grep of course. Also there are a lot more features in the git grep like pattern arithmetic (things like git grep -e pattern1 --and --not \( -e pattern2 -e pattern3 \)), tree search using glob (things like git grep pattern -- '*.[ch]' to search only in .c and .h files) and some more.

Here's an example session for searching in an older revision:

$ mkdir git-test                 # create fresh repository
$ cd git-test/

	# with changes to become unstaged
	git reset HEAD~

	# to blow away commit and changes
	git reset --hard HEAD~


	# http://stackoverflow.com/questions/927358/how-do-you-undo-the-last-commit

	# between two commit sha's
	git diff --name-only SHA1 SHA2

	# see the differences between the tenth latest commit and the fifth latest (or so).
	git diff --name-only HEAD~10 HEAD~5

	# create instance
	# download keypair
	chmod 400 path/to/key
	ssh -i path/to/key.pem [email protected]
	sudo apt-get update && sudo apt-get upgrade
	sudo apt-get install git

	# python
	sudo apt-get install python-virtualenv
	sudo mkdir /opt/envs

	git rebase --interactive HEAD~2 # 2 being the number of commits you wish to use

	# should see commits listed:

	# pick <foo bar pop>
	# pick <foo2 ba2r pop2>

	# change the commits that should squash to `s` instead of pick:

	# pick <foo bar pop>

	git shortlog -s -n

	# for all branches
	git shortlog -s -n --all

	# print a git diff on a file between two commit hashes
	# pipe to cut and `-c` is chars `2-` to 2 from beginning then to end.
	git diff <sha 1> <sha 2> foo/bar/file \| cut -c 2-