Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:18:32 +0000 (10:18 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:18:32 +0000 (10:18 -0700)
* maint:
builtin-apply: fix typo leading to stack corruption
git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
builtin-merge.c: allocate correct amount of memory
Makefile: do not set NEEDS_LIBICONV for Solaris 8
rebase -i: remove leftover debugging
rebase -i: proper prepare-commit-msg hook argument when squashing

No differences found