git, branch v1.5.0.1

GIT 1.5.0.1

2007-02-19T00:18:43Z

Signed-off-by: Junio C Hamano

Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding

2007-02-18T23:58:20Z

Similarly for i18n.logoutputencoding. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

Read the config in rev-list

2007-02-18T23:58:08Z

Otherwise "git rev-list --header HEAD" will not do the right thing if i18n.commitencoding is set. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

Update draft release notes for 1.5.0.1

2007-02-18T00:15:22Z

Signed-off-by: Junio C Hamano

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

2007-02-18T00:13:17Z

* git://git.kernel.org/pub/scm/gitk/gitk: Make gitk save and restore window pane position on Linux and Cygwin. Make gitk save and restore the user set window position. [PATCH] gitk: Use show-ref instead of ls-remote [PATCH] Make gitk work reasonably well on Cygwin. [PATCH] gitk - remove trailing whitespace from a few lines. Change git repo-config to git config

Convert update-index references in docs to add.

2007-02-17T18:20:27Z

Since `git add` is the approved porcelain for an end-user to invoke when they want to manipulate the index, porcelain documentation should steer the user to this command rather than the pure plumbing update-index. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Attempt to improve git-rebase lead-in description.

2007-02-17T18:08:21Z

It was mentioned on #git this morning that the lead-in description of git-rebase is very confusing. Too many branch this and branch that in a very short run of text. This new description attempts to walk the user through the command syntax, while also describing exactly what git-rebase is doing to their repository. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Do not take mode bits from index after type change.

2007-02-17T06:56:06Z

When we do not trust executable bit from lstat(2), we copied existing ce_mode bits without checking if the filesystem object is a regular file (which is the only thing we apply the "trust executable bit" business) nor if the blob in the index is a regular file (otherwise, we should do the same as registering a new regular file, which is to default non-executable). Noticed by Johannes Sixt. Signed-off-by: Junio C Hamano

git-blame: prevent argument parsing segfault

2007-02-17T05:39:21Z

The 3rd branch in builtin-blame.c should also check for lacking arguments. Running that in top dir does not trigger the problem because the 'prefix' is NULL. Signed-off-by: Tommi Kyntola Signed-off-by: Junio C Hamano

git-merge: minor fix for no_trivial_merge_strategies.

2007-02-16T23:08:25Z

The shell loop to determine if we should skip the trivial in-index merge stage based on what strategy is given was not prepared to have more than one strategy listed in the variable $no_trivial_merge_strategies. This does not trigger unless you use a modified git but the fix is simple and straightforward, so let's fix it before 1.5.0.1. Signed-off-by: Junio C Hamano