Differences

This shows you the differences between two versions of the page.

--- git [2026/06/07 01:41] – [commit] jhagstrand
+++ git [2026/06/07 23:56] (current) – [Configuration] jhagstrand
@@ Line 236: / Line 236: @@
 git log --oneline --graph # shows a hierarchy of branches
+==== interactive rebase ====
+If you don't like the way the log looks now, the interactive rebase command lets you fix, reorder, drop and squash the commits, and reword the commit messages.  Do this in a branch you are working solo, not a public branch or one that has already been pushed.
+  $ git switch mybranch
+  $ git rebase -i HEAD~3
+  $ git rebase -i b619fca0
+The log is displayed in reverse chronological order.
+The interactive rebase editor window displays the commits in chronological order.
+A note about reordering the commits.  The interactive rebase operation will start at the base and reapply your commits in new new order, rewriting your source code files in each commit.  It is possible to break code if you make a mistake.
+https://www.sitepoint.com/git-interactive-rebase-guide/
 ===== How to use =====
+==== Configuration ====
+Use git config --global to set name and email.
+  * Support anonymity by using a shielded email, like for example the private GitLab noreply masked email.
+  * Consider using a pair-programming persona as user.name to give credit to the AI author.
+  $ git config --global user.name "Your Name"
+  $ git config --global user.name "Your Name & Gemini 1.5 Flash"  # pair-programming personna
+  $ git config --global user.email "jerry@gmail.com"              # protect privacy on public host like gitlab
+Aider automatically adds a Co-authored by: line to the body.  Tell aider to skip that by adding parameters to .aider.conf.yml file:
+  attribute-author: false
+  attribute-committer: false
 ====Create a new repository====