divvun / gut

A Git(Hub) multirepo maintenance tool
6 stars 0 forks source link

add rebase option to pull #161

Closed ZoeyR closed 4 years ago

ZoeyR commented 4 years ago

Closes #153

snomos commented 4 years ago

Looks mostly good 👍 Two minor things:

  1. the help text must be updated
  2. I really would like rebase to be the default, and have --merge as the option for those knowing what they do.

The main reason for the second point is that most people using gut will be people who are not too familiar with git, and they will use gut pull in the default mode. If the default is merge, then there will be a large number of pointless merge commits. In all but the most specific cases rebase is the most sensible option.