git, branch v1.6.3-rc2

GIT 1.6.3-rc2

2009-04-25T05:59:35Z

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-04-25T05:59:08Z

* maint: test-genrandom: Add newline to usage string

Merge branch 'maint-1.6.1' into maint

2009-04-25T05:58:31Z

* maint-1.6.1: test-genrandom: Add newline to usage string

Merge branch 'maint-1.6.0' into maint-1.6.1

2009-04-25T05:49:34Z

* maint-1.6.0: test-genrandom: Add newline to usage string

t7800: respect NO_PERL

2009-04-24T16:24:35Z

Difftool is written in perl, so we don't build it if NO_PERL is set. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

remote.c: do not trigger remote.. `codepath for two-level names`

2009-04-24T08:29:28Z

If the config file contains a section like this: [remote] default = foo (it should be '[remotes]') then commands like git status git checkout git branch -v fail even though they are not obviously related to remotes. (These commands write "ahead, behind" information and, therefore, access the per-remote information). Unknown configuration keys should be ignored, not trigger errors. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

builtin-help: silently tolerate unknown keys

2009-04-24T08:29:13Z

If for some reason the config file contains a key without a subkey like [man] foo = bar then even a plain git help produces an error message. With this patch such an entry is ignored. Additionally, the warning about unknown sub-keys is removed. It could become annoying if new sub-keys are introduced in the future, and then the configuration is read by an old version of git that does not know about it. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

Explain seemingly pointless use of system in difftool

2009-04-24T08:20:35Z

Portability reasons. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

Makefile: ignore perl/ subdirectory under NO_PERL

2009-04-23T19:53:32Z

The install target still descends into perl subdirectory when NO_PERL is requested. Fix this. Acked-by: Jeff King Signed-off-by: Junio C Hamano

config.txt: Make configuration paragraph more consistent