diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-01 23:55:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-01 23:55:51 -0700 |
| commit | 2b603260f325b895baa20867bd45c8e251f19b78 (patch) | |
| tree | 3e738846185eeebd2985940715197d91bec15f4f | |
| parent | Allow "non-option" revision options in parse_option-enabled commands (diff) | |
| parent | Start 1.5.6.5 RelNotes to describe accumulated fixes (diff) | |
| download | tgif-2b603260f325b895baa20867bd45c8e251f19b78.tar.xz | |
Merge branch 'maint'
| -rw-r--r-- | Documentation/RelNotes-1.5.6.5.txt | 19 | ||||
| -rw-r--r-- | builtin-revert.c | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/Documentation/RelNotes-1.5.6.5.txt b/Documentation/RelNotes-1.5.6.5.txt new file mode 100644 index 0000000000..fc40438b16 --- /dev/null +++ b/Documentation/RelNotes-1.5.6.5.txt @@ -0,0 +1,19 @@ +GIT v1.5.6.5 Release Notes +========================== + +Fixes since v1.5.6.4 +-------------------- + +* "git init --template=" with blank "template" parameter linked files + under root directories to .git, which was a total nonsense. Instead, it + means "I do not want to use anything from the template directory". + +* "git show-branch" mishandled its 8th branch. + +* Addition of "git update-index --ignore-submodules" that happened during + 1.5.6 cycle broke "git update-index --ignore-missing". + +* "git send-email" did not parse charset from an existing Content-type: + header properly. + +Contains other various documentation fixes. diff --git a/builtin-revert.c b/builtin-revert.c index e9da870d22..27881e9493 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -180,7 +180,7 @@ static void set_author_ident_env(const char *message) email++; timestamp = strchr(email, '>'); if (!timestamp) - die ("Could not extract author email from %s", + die ("Could not extract author time from %s", sha1_to_hex(commit->object.sha1)); *timestamp = '\0'; for (timestamp++; *timestamp && isspace(*timestamp); |