git/git-commit.sh, branch v1.5.0-rc3

git-commit -s: no extra space when sign-offs appear at the end already.

2007-01-29T09:06:27Z

Signed-off-by: Junio C Hamano

[PATCH] Rename git-repo-config to git-config.

2007-01-29T00:16:53Z

Signed-off-by: Tom Prince Signed-off-by: Junio C Hamano

Documentation: --amend cannot be combined with -c/-C/-F.

2007-01-24T23:32:52Z

We used to get the following confusing error message: $ git commit --amend -a -m foo Option -m cannot be combined with -c/-C/-F This is because --amend cannot be combined with -c/-C/-F, which makes sense, because they try to handle the same log message in different ways. So update the documentation to reflect this. Signed-off-by: Peter Eriksen Signed-off-by: Junio C Hamano

[PATCH] honor --author even with --amend, -C, and -c.

2007-01-23T03:40:57Z

Earlier code discarded GIT_AUTHOR_DATE taken from the base commit when --author was specified. This was often wrong as that use is likely to fix the spelling of author's name. Signed-off-by: Junio C Hamano

Merge branch 'jc/int'

2007-01-14T20:04:25Z

* jc/int: More tests in t3901. Consistent message encoding while reusing log from an existing commit. t3901: test "format-patch | am" pipe with i18n Use log output encoding in --pretty=email headers.

Consistent message encoding while reusing log from an existing commit.

2007-01-13T21:33:07Z

The following commands can reuse log message from an existing commit while creating a new commit: git-cherry-pick git-rebase (both with and without --merge) git-commit (-c and -C) When the original commit was made in a different encoding from the current i18n.commitencoding, "cat-file commit" would give a string that is inconsistent with what the resulting commit will claim to be in. Replace them with "git show -s --encoding". "git-rebase" without --merge is "git format-patch" piped to "git am" in essence, and has been taken care of before this commit. Signed-off-by: Junio C Hamano

Use cd_to_toplevel in scripts that implement it by hand.

2007-01-13T00:54:38Z

This converts scripts that do "cd $(rev-parse --show-cdup)" by hand to use cd_to_toplevel. I think git-fetch does not have to go to the toplevel, but that should be dealt with in a separate patch. Signed-off-by: Junio C Hamano

Merge branch 'jc/bare'

2007-01-12T00:50:36Z

* jc/bare: Disallow working directory commands in a bare repository. git-fetch: allow updating the current branch in a bare repository. Introduce is_bare_repository() and core.bare configuration variable Move initialization of log_all_ref_updates

Disallow working directory commands in a bare repository.

2007-01-10T23:03:09Z

If the user tries to run a porcelainish command which requires a working directory in a bare repository they may get unexpected results which are difficult to predict and may differ from command to command. Instead we should detect that the current repository is a bare repository and refuse to run the command there, as there is no working directory associated with it. [jc: updated Shawn's original somewhat -- bugs are mine.] Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

git-commit: do not fail to print the diffstat even if there is a file named HEAD

2007-01-08T22:45:59Z

Signed-off-by: Michael Loeffler Signed-off-by: Junio C Hamano