git

One liner: git rev-list --objects --all \ | git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' \ | sed -n 's/^blob //p' \ | sort --numeric-sort --key=2 \ | cut -c 1-12,41- \ | $(command -v gnumfmt || echo numfmt) --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest Credit SO: https://stackoverflow.

The command: git log --oneline master..feature/some-branch Will show commits on feature branch since it was forked off master. Suppose you have a repo that looks like this: base - A - B - C - D (master) \ \- X - Y - Z (myBranch) Verify the repo status:

Preamble After a merge conflict resolution you’re often left with files ending with .orig extension. I have them added to my global .gitignore. Hence I can’t easily get rid of them with regular: git clean -fd.

Symptoms of the problem: internet connection is fast and a torrent download of Ubuntu can go at 10MB/s, but git clone gets ‘stuck’ at 500-600KB/s.

How to make a zip copy of all git repo files without garbage

You have a git repo which contains sub-directories which are git repos themselves and now you want them to become submodules. Here’s a quick automatic way to add them all.

Resolving merge conflicts is one the things that I hate most. Lets make it a little easier with p4merge.