]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'pw/rebase-i-more-options'
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Sep 2020 19:37:01 +0000 (12:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Sep 2020 19:37:01 +0000 (12:37 -0700)
commit9c31b19dd00981fcea435de1cd05eab179039a8d
tree970ac78108fa329c76070f30ed1b3280add80c87
parente19713638985533ce461db072b49112da5bd2042
parent6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52
Merge branch 'pw/rebase-i-more-options'

"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
Documentation/git-rebase.txt
builtin/am.c
builtin/commit.c
builtin/rebase.c
commit.c
commit.h
ident.c
sequencer.c
sequencer.h