The git spring cleanup challenge completion

Hello,

One month ago I suggested the git spring cleanup challenge [1], which after 50 replies can probably be considered a success.

After one month of trying my best not to add many configurations, this is my final .gitconfig:

  [merge]
    conflictstyle = diff3
  [alias]
    co = commit -v -s
    br = branch

Judging from the discussion, diff3 should definitely become the new default conflict style. I already sent some patches [2] to try to start moving in that direction, but unfortunately it doesn't seem to be that easy because many commands simply ignore that configuration, while others have issues with the configuration and the command line. Many probably need a new command line argument to specify the desired conflict style. A lot of work is needed.

Not to mention the two new proposals to have a new, better diff3: zdiff3 [3] [4]. These come from a proposal from Uwe Kleine-König in 2013 [5].

Other than that, it's fair to say that *everyone* needs some command aliases to use git. This past month shell completions have saved me, but not completely. I can't imagine how a newcomer must feel using git without any alias.

I sent some patches to attempt to have some standard default aliases [6], also, there's this old thread where default aliases were discussed at depth [7].

Another uncontroversial configuration everyone agrees should be the default is `rerere.enabled`. Although `rerere.autoupdate` is more controversial, I don't see why it cannot be considered too.

Here's a few other interesting configurations:

  * rebase.autosquash = true
  * rebase.autostash = true 
  * commit.verbose = true
  * diff.colorMoved = true
  * grep.patternType = perl
  * alias.undo = reset --hard @{1}
  * feature.experimental = true
  * branch.sort = committerdate
  * diff.algorithm = histogram

I for one can't wait to finally have proper aliases again.

That was painful.

Cheers.

[1] https://lore.kernel.org/git/60b5d281552d6_e359f20828@natae.notmuch/ [2] https://lore.kernel.org/git/20210622002714.1720891-1-felipe.contreras@gmail.com/ [3] https://lore.kernel.org/git/20210613143155.836591-1-felipe.contreras@gmail.com/ [4] https://lore.kernel.org/git/b7561a67c192d4bdede47fee5b7b1cb30c44b785.1623734171.git.gitgitgadget@gmail.com/ [5] https://lore.kernel.org/git/1362602202-29749-1-git-send-email-u.kleine-koenig@pengutronix.de/ [6] https://lore.kernel.org/git/20210702100506.1422429-1-felipe.contreras@gmail.com/T/#t [7] https://lore.kernel.org/git/CAMP44s17h4Tjg+VaMF0atLep8t-0HVp4UDr1WE2wYnEuZ07eaQ@mail.gmail.com/