![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jan 2011 20:14:45 +0000 (12:14 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jan 2011 20:14:45 +0000 (12:14 -0800) | ||
| commit | 2af8b5ddaca41f133732c779b38f508de3af94b1 | |
| tree | d9298528e3febab001f1fd69657c7cd86f1ce186 | tree | snapshot |
| parent | 12451804d86556d2b1aa03ec913689a845259ed3 | commit | diff |
| parent | d2d434beeb03e4ee648ca7ca2a1ea1ed09077306 | commit | diff |
Merge branch 'master' into next
* master:
Don't pass "--xhtml" to hightlight in gitweb.perl script.
rebase -i: clarify in-editor documentation of "exec"
tests: sanitize more git environment variables
fast-import: treat filemodify with empty tree as delete
rebase: give a better error message for bogus branch
rebase: use explicit "--" with checkout
* master:
Don't pass "--xhtml" to hightlight in gitweb.perl script.
rebase -i: clarify in-editor documentation of "exec"
tests: sanitize more git environment variables
fast-import: treat filemodify with empty tree as delete
rebase: give a better error message for bogus branch
rebase: use explicit "--" with checkout