From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx>
Danh pointed out that the word "ident" gets misinterpreted by
translators as "indentation" leading to incorrect translations so I've
reworded an error message.
format-patch and am could do with having their similar messages
updated in the future
Phillip Wood (2):
rebase -i: support --committer-date-is-author-date
rebase -i: support --ignore-date
Rohit Ashiwal (3):
rebase -i: add --ignore-whitespace flag
sequencer: rename amend_author to author_to_free
rebase: add --reset-author-date
Documentation/git-rebase.txt | 33 ++++-
builtin/rebase.c | 47 +++++--
sequencer.c | 112 ++++++++++++++-
sequencer.h | 2 +
t/t3422-rebase-incompatible-options.sh | 2 -
t/t3436-rebase-more-options.sh | 180 +++++++++++++++++++++++++
6 files changed, 353 insertions(+), 23 deletions(-)
create mode 100755 t/t3436-rebase-more-options.sh
Range-diff against v6:
1: 0fc90eaff1 ! 1: 3865fdf461 rebase -i: support --ignore-date
@@ sequencer.c: static const char *author_date_from_env_array(const struct argv_arr
+ struct strbuf new_author = STRBUF_INIT;
+
+ if (split_ident_line(&ident, author, strlen(author)) < 0) {
-+ error(_("malformed ident line '%s'"), author);
++ error(_("invalid author identity: %s"), author);
+ return NULL;
+ }
+
2: 21cf5e5512 = 2: 0b6b19cb68 rebase: add --reset-author-date
--
2.27.0
