Skip to content

Commit

Permalink
Add '.git-blame-ignore-revs' to the project (#37822)
Browse files Browse the repository at this point in the history
* Add '.git-blame-ignore-revs' to the project

* Add another commit to the list

* Add documentation section
  • Loading branch information
Mamaduka authored Jan 26, 2022
1 parent ce179fc commit b56b40d
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Set line width to 80.
4857ad58c1241b3d63d21a6880c989b85746c3dc

# ESLint updates.
f63053cace3c02e284f00918e1854284c85b9132
18 changes: 18 additions & 0 deletions docs/contributors/code/git-workflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,21 @@ git push
```

The above commands will update your `trunk` branch from _upstream_. To update any other branch replace `trunk` with the respective branch name.

## Miscellaneous

### Git Archeology

When looking for a commit that introduced a specific change, it might be helpful to ignore revisions that only contain styling or formatting changes.

Fortunately, newer versions of `git` gained the ability to skip commits in history:

```
git blame --ignore-rev f63053cace3c02e284f00918e1854284c85b9132 -L 66,73 packages/api-fetch/src/middlewares/media-upload.js
```

All styling and formatting revisions are tracked using the `.git-blame-ignore-revs` file in the Gutenberg repository. You can use this file to ignore them all at once:

```
git blame --ignore-revs-file .git-blame-ignore-revs -L 66,73 packages/api-fetch/src/middlewares/media-upload.js
```

0 comments on commit b56b40d

Please sign in to comment.