Waldir Pimenta waldyrious

Git alias: `merge-diff`

Note: This alias and the explanation below were created with Gemini 3, and manually edited for clarity and comprehensiveness.

Summary

This alias allows you to check whether a branch has been fully merged into a target branch (even if squash-merged or rebase-merged) and, if not, view the exact diff of what remains to be integrated.

Unlike a standard git diff, this approach:

Ignores history divergence: It bypasses any changes that may have been added to the target branch on top of the point that your branch branched off from. In other words, it compares the final state of your branch against the target, as if you had done a git rebase followed by git diff .

Principles for good commit messages

A summary of the patterns and best practices I use in git commit messages.

Standard Practices

The commits analyzed generally follow the well-established conventions documented in:

aspe:keyoxide.org:Q24ZRMWF2VFSRKFSDLTOXCG43Q

Run the following query (inspired by this one) to get the list of exoplanets (Q44559) whose names start with "NAME":
```
SELECT ?qid ?Len
WHERE
{
  ?qid wdt:P31 wd:Q44559;
        rdfs:label ?Len;
```

FILTER (lang(?Len) = "en").

git rebase

Reapply commits from one branch on top of another branch. Commonly used to "move" an entire branch to another base, creating copies of the commits in the new location. More information: https://git-scm.com/docs/git-rebase.

# Rebase the current branch on top of another specified branch:
git rebase {{new_base_branch}}

Mouse & keyboard interaction
- In the main grid overview mode:
  - Cmd+Shift+<: go to character
    - Type the actual character, an alias like "smileface", or "uniXXXX" for the unicode code point
  - Cmd+K: show metrics window
- In character design mode:
  - Scroll: move
  - Shift+Scroll: move horizontally
  - Shift+Control+Scroll down: zoom in (centered in the screen, not the cursor)
Useful menu entries

	<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
	<opml version="2.0">
	<body>
	<outline text="Foo">
	<outline text="Bar" _note="Baz"/>
	</outline>
	</body>
	</opml>

	// Inspired by https://attacomsian.com/blog/deep-anchor-links-javascript
	// How to use: Create a new browser bookmark with the code below as the URL.
	// See https://www.freecodecamp.org/news/what-are-bookmarklets/
	// for more background and detailed instructions.
	javascript:document.querySelectorAll('h2[id], h3[id], h4[id], h5[id], h6[id]').forEach(heading => {
	let anchor = document.createElement('a');
	anchor.href = '#' + heading.getAttribute('id');
	anchor.innerText = '#';
	anchor.style = 'margin-left: 0.3em';
	heading.appendChild(anchor);

	# To use with the [vscode-restclient](https://github.com/Huachao/vscode-restclient) extension

	#-------------------------------------------------------------------------------
	# Example with JSON data
	POST https://api.example.com/address
	Content-Type: application/json

	{
	"foo": "bar",
	"baz": "qux"