Skip to content

Commit 9a60fc9

Browse files
Sync with main
Signed-off-by: Lukasz Gryglicki <lgryglicki@cncf.io> Assisted by [OpenAI](https://platform.openai.com/) Assisted by [GitHub Copilot](https://github.com/features/copilot)
2 parents d2a1611 + 4e5da38 commit 9a60fc9

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

utils/git_sync_to_branch.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
if [ -z "$1" ]
3+
then
4+
echo "Usage: $0 <branch-name>"
5+
exit 1
6+
fi
7+
echo "To be used when you are on a feature branch based on main and want to sync it with current $1 branch, so after merging current branch to main it will be the same as $1 but you can commit this once"
8+
9+
git fetch origin
10+
git branch
11+
git status
12+
echo -n 'proceed (ctrl+c to stop)? '
13+
read
14+
15+
git rm -r --cached .
16+
# git checkout origin/$1 -- .
17+
git checkout $1 -- .
18+
git add -A
19+
20+
echo "Now you can do: git commit -S -asm 'msg'; git push"

utils/otel_dd/api_usage_stats_ddog.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env python3
2+
23
# Copyright The Linux Foundation and each contributor to CommunityBridge.
34
# SPDX-License-Identifier: MIT
45

0 commit comments

Comments
 (0)