projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: de1d4fa 1b9bc5a)
Merge branch 'fix'
authorJunio C Hamano <junkio@cox.net>
Mon, 15 May 2006 20:48:22 +0000 (13:48 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 15 May 2006 20:48:22 +0000 (13:48 -0700)
commitd55aaefa3e3920bdf9a52d80da2a244f72742228
treec265d4d469c854e633886dad092ede685e248a93tree | snapshot
parentde1d4fa2a1273e09c32653c7a21602e36223348ccommit | diff
parent1b9bc5a7b7434d771726011613a00cb202bd9f44commit | diff
Merge branch 'fix'

* fix:
  Fix pack-index issue on 64-bit platforms a bit more portably.
  Install git-send-email by default
  Fix compilation on newer NetBSD systems
  git config syntax updates
  Another config file parsing fix.
  checkout: use --aggressive when running a 3-way merge (-m).
Makefile diff1 | diff2 | blob | history
pack-objects.c diff1 | diff2 | blob | history
repo-config.c diff1 | diff2 | blob | history
sha1_file.c diff1 | diff2 | blob | history
t/t1300-repo-config.sh diff1 | diff2 | blob | history
The core git plumbing