Public Git Hosting - git/peff.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: b3a4f85 38762c4)

commit	d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9
author	Junio C Hamano <gitster@pobox.com>
	Thu, 29 Nov 2007 01:06:57 +0000 (28 17:06 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 29 Nov 2007 01:06:57 +0000 (28 17:06 -0800)
tree	88de4825ce11d7eaed4719b0b9db1d0e649f9107	tree \| snapshot (tar.gz zip)
parent	b3a4f8586b4ffa6c896cf0afb2ea49d64faf81ad	commit \| diff
parent	38762c47d6442dc0ce0f45533f9151877c485337	commit \| diff

Merge branch 'maint'

* maint:
scripts: do not get confused with HEAD in work tree
Improve description of git-branch -d and -D in man page.

Documentation/git-branch.txt	diff1 \|	diff2 \|	blob \| history
contrib/examples/git-merge-ours.sh	diff1 \|	diff2 \|	blob \| history
git-am.sh	diff1 \|	diff2 \|	blob \| history
git-filter-branch.sh	diff1 \|	diff2 \|	blob \| history
git-rebase--interactive.sh	diff1 \|	diff2 \|	blob \| history
git-rebase.sh	diff1 \|	diff2 \|	blob \| history
git-stash.sh	diff1 \|	diff2 \|	blob \| history

peff's git enhancements