Re: synchronizing with Emacs, take two

[Ted Zlatanov <tzz@lifelogs.com>]

On Thu, 12 Aug 2010 15:50:05 -0500 Ted Zlatanov <tzz@lifelogs.com> wrote: 

TZ> On Fri, 02 Jul 2010 12:57:32 +0900 Katsumi Yamaoka <yamaoka@jpl.org> wrote: 
KY> Ted Zlatanov wrote:
>>> Then the Bazaar commit message can be just that first line.  If there's
>>> no newline after the first line in our commit message, we'll know the
>>> comitter didn't provide a one-line summary.

KY> Oh, I see.  I learned that that empty line is significant.

TZ> I think it's reasonable.  It should look nice in this format:

TZ> git log --oneline

TZ> e.g.

TZ> ...
TZ> 77a9b0f Minor bug fixes for gnus-sync.el.
TZ> 2a6fa29 Make saving and restoring of hidden threads work with overlays. Patch applied by Ted Zlatanov.
TZ> e1bba25 Add new gnus-sync.el library.
TZ> ...

TZ> That's very handy when you're reviewing changes.

I wanted to give my .gitconfig file in case anyone finds it useful.  The
lg and lg2 aliases in particular can make life easier.  I've collected
them from many places so I can't give credit where it's due.

Ted

[color]
	diff = auto
	status = auto
	branch = auto
	interactive = auto

[alias]
	st = status
	ci = commit
	co = checkout
	staged = "diff --cached"
	unstaged = diff
	both = "diff HEAD"
	oneline = "log --pretty=oneline"
	amend = "commit --ammend"
	am = "commit --ammend"
        lg = "log --graph --all --pretty=format:'%Cred%h%Creset - %Cgreen(%cr)%Creset %s%C(yellow)%d%Creset' --abbrev-commit --date=relative"
        lg2 = "log --oneline --date-order --graph --all --decorate"
	l = pull
	h = push
	hard = "reset --hard HEAD"
	r = "reset HEAD"
        ca = "commit -a"
        aa = "add -A"