git.verplant.org Git - git.git/commit

author	Junio C Hamano <junkio@cox.net>
	Sat, 13 May 2006 21:10:48 +0000 (14:10 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Sat, 13 May 2006 21:11:43 +0000 (14:11 -0700)
commit	8d48ad62a902556b523ee892a3fbe4206d576d3f
tree	7ac4f3014ebba31845797f62fc39dac5cd246dd1	tree \| snapshot
parent	639ca5497279607665847f2e3a11064441a8f2a6	commit \| diff
parent	d14f776402d9f7040cc71ff6e3b992b2e019526a	commit \| diff

Merge branch 'lt/fix-config' into lt/config

* lt/fix-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

with manual adjustment of t/t1300 for "git repo-config --list" option.

Signed-off-by: Junio C Hamano <junkio@cox.net>

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

RSS Atom

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