projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 749bc58 44c33a5)
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)
commit635536488c3efcf8495333b6a94e3e33c36fc055
treedbe59109f95a57e008933d56ab28e72c7ae410ectree | snapshot
parent749bc58c5eab5b6947d2c01e02d12320005eba99commit | diff
parent44c33a5b9603fba7c9556512a72e4e392ba4ae2dcommit | diff
Merge branch 'maint'

* 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
Makefile diff1 | diff2 | blob | history
builtin-apply.c diff1 | diff2 | blob | history
builtin-merge.c diff1 | diff2 | blob | history
Git—the stupid content tracker