git, branch v1.6.3.1

GIT 1.6.3.1

2009-05-13T05:30:29Z

Signed-off-by: Junio C Hamano

Merge branch 'maint-1.6.2' into maint

2009-05-12T16:58:34Z

* maint-1.6.2: Revert "checkout branch: prime cache-tree fully"

Merge branch 'jc/maint-read-tree-multi' into maint-1.6.2

2009-05-12T16:58:21Z

* jc/maint-read-tree-multi: Revert "checkout branch: prime cache-tree fully"

Revert "checkout branch: prime cache-tree fully"

2009-05-12T16:57:21Z

The logic in 83ae209 (checkout branch: prime cache-tree fully, 2009-04-20) is bogus; checkout can switch branches with a dirty index and in such a case the tree won't match HEAD. Add t2014-switch to catch this breakage. Signed-off-by: Junio C Hamano

Documentation: cloning to empty directory is allowed

2009-05-09T08:28:08Z

Cloning into an existing empty directory is now allowed: commit 55892d23981917aefdb387ad7d0429f90cbd446a ("Allow cloning to an existing empty directory") Signed-off-by: Alexander Potashev Signed-off-by: Junio C Hamano

Clarify kind of conflict in merge-one-file helper

2009-05-09T07:27:39Z

Not as verbose as the recursive merge driver, but better still. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

git config: clarify --add and --get-color

2009-05-09T07:19:25Z

Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

archive-tar.c: squelch a type mismatch warning

2009-05-09T06:57:29Z

On some systems, giving a value of type time_t to printf "%lo" that expects an unsigned long would give a type mismatch warning. Signed-off-by: Junio C Hamano

Start 1.6.3.1 maintenance series.

2009-05-09T04:49:14Z

Signed-off-by: Junio C Hamano

Merge branch 'maint-1.6.1' into maint-1.6.2

2009-05-09T04:13:47Z

* maint-1.6.1: