git, branch v1.6.5-rc2

pull: Clarify "helpful" message for another corner case

2009-09-23T05:26:27Z

When the remote branch we asked for merging did not exist in the set of fetched refs, we unconditionally hinted that it was because of lack of configuration. It is not necessarily so, and risks sending users for a wild goose chase. Make sure to check if that is indeed the case before telling a wild guess to the user. Signed-off-by: Junio C Hamano

Update "describe" documentation to match reality

2009-09-23T02:40:05Z

A sample "git describe -h" did not match what the program actually says. Signed-off-by: Thiago Farina Signed-off-by: Junio C Hamano

bash: teach 'git reset --patch'

2009-09-22T19:47:27Z

Signed-off-by: SZEDER Gábor Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

bash: update 'git stash' completion

2009-09-22T19:47:26Z

This update adds 'git stash (apply|pop) --quiet' and all options known to 'git stash save', and handles the DWIMery from 3c2eb80f (stash: simplify defaulting to "save" and reject unknown options, 2009-08-18). Care is taken to avoid offering subcommands in the DWIM case. Signed-off-by: SZEDER Gábor Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

bash: rename __git_find_subcommand() to __git_find_on_cmdline()

2009-09-22T19:47:26Z

__git_find_subcommand() was originally meant to check whether subcommands are already present on the command line. But the code is general enough to be used for checking the presence of command line options as well, and the next commit will use it for that purpose, so let's give it a more general name. Signed-off-by: SZEDER Gábor Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

pay attention to DESTDIR when building with NO_PERL_MAKEMAKER

2009-09-22T19:20:40Z

Building with prefix=/some/where and temporarily installing it to elsewhere for tar'ing up is done with: make prefix=/some/where make prefix=/some/where DESTDIR=/else/where install Make handcrafted perl/perl.mak without NO_PERL_MAKEMAKER honour DESTDIR. Ancient ExtUtils::MakeMaker (pre 6.11?) has the same issue, but recent versions of Perl ships with at leat 6.17; this patch does not address that issue. Signed-off-by: Junio C Hamano

pre-commit.sample: add comment re tr portability; fix grammar

2009-09-22T19:15:42Z

Add a comment explaining why square brackets around a tr range are not only ok, but actually required in this case. Correct spelling and grammar. Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano

Update Release Notes to 1.6.5

2009-09-22T01:14:12Z

Signed-off-by: Junio C Hamano

test-genrandom: ensure stdout is set to _O_BINARY on Windows

2009-09-21T07:36:12Z

Commit a6ca8c62 (Set _O_BINARY as default fmode for both MinGW and MSVC) removed the definition of _CRT_fmode from mingw.c. Before this commit, since test-genrandom is linked against libgit.a, the MinGW process initialization code would pick up that definition of _CRT_fmode, which was initialized to _O_BINARY. After this commit, however, text mode is used for std(in|out|err) because it is the default in absence of _CRT_fmode. In order to fix that, we must use git-compat-util.h, which overrides main() to set the mode to binary. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

Merge git://git.kernel.org/pub/scm/gitk/gitk

2009-09-21T06:47:52Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Work around leftover temporary save file gitk: Show diff of commits at end of compare-commits output gitk: Update Swedish translation (280t0f0u)