Re: [PATCH v5 0/3] rebase: support --autosquash without -i

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Andy

On 14/11/2023 21:43, Andy Koppe wrote:
Make rebase --autosquash work without --interactive, but limit
rebase.autoSquash's effects to interactive mode, and improve testing
and documentation.

Changes from v4:
- Fix amend vs apply backend thinko in commit messages.
- Squash patch 3 for testing into patch 2 and improve the commit
   message.
- No source changes.

Thanks again to Junio and Phillip for their reviews.

Thanks for the re-roll this version looks good to me

Best Wishes

Phillip


Andy Koppe (3):
   rebase: fully ignore rebase.autoSquash without -i
   rebase: support --autosquash without -i
   rebase: rewrite --(no-)autosquash documentation

  Documentation/config/rebase.txt        |  4 ++-
  Documentation/git-rebase.txt           | 34 +++++++++++++----------
  builtin/rebase.c                       | 17 +++++-------
  t/t3415-rebase-autosquash.sh           | 38 +++++++++++++++++++-------
  t/t3422-rebase-incompatible-options.sh | 12 --------
  5 files changed, 58 insertions(+), 47 deletions(-)





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux