archive
/
tailscale
mirror of https://github.com/tailscale/tailscale/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

docs: use -x for cherry-picks

Browse Source 
Updates #cleanup

Change-Id: I5222e23b716b342d7c6d113fc539d2021024348e
Signed-off-by: Tom Proctor <tomhjp@users.noreply.github.com>
pull/18162/merge
Tom Proctor 3 days ago
parent b73fb467e4
commit eed5e95e27
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File

4
docs/commit-messages.md
Unescape Escape View File

@ -163,6 +163,10 @@ When you use `git revert` to revert a commit, the default commit message will id
Don't revert reverts. That gets ugly. Send the change anew but reference Don't revert reverts. That gets ugly. Send the change anew but reference
the original & earlier revert. the original & earlier revert.
# Cherry picks
Use `git cherry-pick -x` to include git's standard "cherry picked from..." line in the commit message. Typically you'll only need this for cherry-picking onto release branches.
# Other repos # Other repos
To reference an issue in one repo from a commit in another (for example, fixing an issue in corp with a commit in `tailscale/tailscale`), you need to fully-qualify the issue number with the GitHub org/repo syntax: To reference an issue in one repo from a commit in another (for example, fixing an issue in corp with a commit in `tailscale/tailscale`), you need to fully-qualify the issue number with the GitHub org/repo syntax:

Write Preview
Loading…
Cancel
Save