projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7278a29 8d48ad6)
Merge branch 'lt/config' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 01:49:54 +0000 (18:49 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 01:49:54 +0000 (18:49 -0700)
commitea892b27b15fbc46a3bb3ad2ddce737dc6590ae5
treefd9fdddbc9cc12f924cc47ff7ea2fc9c74787163tree | snapshot
parent7278a29a277750e9e3cccce3cfb751d6171b1a43commit | diff
parent8d48ad62a902556b523ee892a3fbe4206d576d3fcommit | diff
Merge branch 'lt/config' into next

* lt/config:
  git config syntax updates
  Another config file parsing fix.
  checkout: use --aggressive when running a 3-way merge (-m).
  Fix git-pack-objects for 64-bit platforms
  fix diff-delta bad memory access
The core git plumbing