mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pw/rebase-i-more-options'

Browse Source 
"git rebase -i" learns a bit more options.

* pw/rebase-i-more-options:
  t3436: do not run git-merge-recursive in dashed form
  rebase: add --reset-author-date
  rebase -i: support --ignore-date
  rebase -i: support --committer-date-is-author-date
  am: stop exporting GIT_COMMITTER_DATE
  rebase -i: add --ignore-whitespace flag
This commit is contained in:
Junio C Hamano
2020-09-03 12:37:01 -07:00
parent e197136389 6160b2e9a4
commit 9c31b19dd0
11 changed files with 422 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sequencer.h
View File

@ -45,9 +45,13 @@ struct replay_opts {
int verbose;
int quiet;
int reschedule_failed_exec;
int committer_date_is_author_date;
int ignore_date;
int mainline;
char *committer_name;
char *committer_email;
char *gpg_sign;
enum commit_msg_cleanup_mode default_msg_cleanup;
int explicit_cleanup;