| Commit message (Collapse) | Author | Age |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commands used to find and print the relevant commits:
$ TZ=UTC0 git log --date='format-local:%Y-%m-%d' \
--pretty='%H # %cd | %s' 60db9f785~1..60db9f785 |
grep 'Revert "';
git log --reverse --pretty=%b 60db9f785~1..60db9f785 |
sed -E -n 's/^This reverts commit ([0-9a-z]+).*/\1/p' |
TZ=UTC0 xargs git show --date='format-local:%Y-%m-%d' \
--pretty='%H # %cd | %s' -s | grep -v 'Merge pull request';
TZ=UTC0 git log --no-merges --date='format-local:%Y-%m-%d' \
--pretty='%H # %cd | %s' 54cb3e741~1..54cb3e741
Explanation: The first `git log` basically takes the revision range from
one commit before a given merge commit until the merge commit itself and
prints the commits in that range (which should usually mean all commits
that were in the branch that was merged). In this case, it's the
commits that do the revert.
The second `git log` finds the hash of all commits that were reverted
and prints them.
The `grep -v` and third `git log` are only needed because the merge
commit of the original branch was reverted directly (on commit
97874c3bf), rather than reverting each individual commit on that branch.
So these commands are used to print all of the commits in the original
branch.
Relates to #5315 #5347.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Command used to generate the entries in the new format:
$ TZ=UTC0 git show --date='format-local:%Y-%m-%d' \
--pretty='%H # %cd | %s' -s f43382f1e fe0f975f4
Put the committer date ("%cd") and commit message subject ("%s") as a
comment right after the commit hash ("%H"). The pipe ("|") is intended
to improve readability.
This format looks more similar to the output of `git log --oneline` and
should make it easier to visually parse long lists. It also allows more
hashes to fit into the same amount of lines (at the cost of longer
lines).
Use committer date ("%cd") instead of author date ("%ad") as the former
tells when a commit actually landed on master. This usually matches the
topological order, which should make it easier to verify that all of the
relevant commits are listed (and that there are no extraneous commits).
Use --date + "%cd" instead of just "%ci" because the former can be used
to ensure that the date is always printed in the same timezone (UTC).
|
| |
|
|
|
| |
This is more similar to the default `git log` output and should result
in the matches happening earlier for more recent commits.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add commit f43382f1e ("Revert "move whitelist/blacklist to allow/deny"")
from PR #4410.
As mentioned on commit b023b9a6f ("Exclude allow/deny move in profile
from git blame") / PR #4390, commit fe0f975f4 ("move whitelist/blacklist
to allow/deny") "is just a huge rename", and so is the revert of it.
Note that there is a follow-up to f43382f1e: commit 2e4d52ec6 ("Revert
allow/deny additional files") (sort of related to #4421). It renames a
bit too much, which is later fixed by commit 3836131f3 ("Fix zim and
rednotebook"). Since these are small changes and since they involve
regressions, neither commit is added.
|
|
|
fe0f975f447d59977d90c3226cc8c623b31b20b3 (move whitelist/blacklist to
allow/deny) is just a huge rename w/o effects to the profile. Ignoreing
it in git blame to see which commits actually added/changed a
allow/nodeny command.
Configure git to use .git-blame-ignore-revs:
git config blame.ignoreRevsFile .git-blame-ignore-revs
|
Kelvin M. Klann
rusty-snake