doc/ko: Add some missing option on uftrace-live.md in Korean

[EmpChan]

These four missing options are translated and added to 'uftrace-live.md'

1. public options, --trace = STATE
2. LIVE options, -p PID, --pid=PID
3. RECORD config options, -g, --agent
4. REPLAY options, --no-args

[gichoel]

Hi, EmpChan.

As described in #1957, it looks like you've created a commit after forking, after deleting the branch and forked repository while the previous PR still exists, which is not what we want.

Of course, I could confirm that the two issues identified in the previous PR have been resolved, but it appears that the PR created one unnecessary commit to fix the pre-commit issue.

Therefore, the delete spaces commit should be joined to the previous commit, doc/ko: Add some missing option on uftrace-live.md in Korean, which can be git squash using the git rebase -i command.

Please navigate to your local repository and run the command below to get it into a state where you can squash it.

$ git rebase -i HEAD~2

You should see something like the screen below, change the second pick to squash, save, and exit. (The ... is an omission, so you don't need to follow it).
Before:

pick 31872f40 doc/ko: Add some missing option on uftrace-live.md in Korean
pick a88f922c delete spaces

# Rebase f3b92bb7..a88f922c onto f3b92bb7 (2 commands)
#
# Commands:
# p, pick <commit> = use commit

.......

# However, if you remove everything, the rebase will be aborted.# # # Commands.

After:

pick 31872f40 doc/ko: Add some missing option on uftrace-live.md in Korean
squash a88f922c delete spaces

# Rebase f3b92bb7..a88f922c onto f3b92bb7 (2 commands)
#.
# Commands:
# p, pick <commit> = use commit

.......

# However, if you remove everything, the rebase will be aborted.
# # # Commands.

The next screen, shown below, is for creating a commit message to be displayed after combining the two commits, and since we only need the contents of the first commit, we erase the contents of the second commit as shown below, save and exit. (The ... means omit, so you don't need to follow it).
Before:

# This is a combination of 2 commits.
# This is the 1st commit message:

doc/ko: Add some missing option on uftrace-live.md in Korean

These four missing options are translated and added to 'uftrace-live.md'

public options, --trace = STATE
LIVE options, -p PID, --pid=PID
RECORD config options, -g, --agent
REPLAY options, --no-args

Signed-off-by: JaeChanHwang <[email protected]>

# This is the commit message #2:

delete spaces

delete spaces of added contents

Signed-off-by: JaeChanHwang <[email protected]>

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.

......

# Changes to be committed:
# modified: doc/ko/uftrace-live.md

After:

# This is a combination of 2 commits.
# This is the 1st commit message:

doc/ko: Add some missing option on uftrace-live.md in Korean

These four missing options are translated and added to 'uftrace-live.md'

public options, --trace = STATE
LIVE options, -p PID, --pid=PID
RECORD config options, -g, --agent
REPLAY options, --no-args

Signed-off-by: JaeChanHwang <[email protected]>

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.

......

# Changes to be committed:
# modified: doc/ko/uftrace-live.md

Finally, if you run into any problems while making changes or don't know what to do, leave a comment and we'll try to help :)

[EmpChan]

Thanks for comments.
I'm trying but, commit keep increase how i can solve it?

[gichoel]

I checked the branch in EmpChan's uftrace repository, and
I think you can revert to the delete spaces commit, which is the last commit we need to keep, and do git rebase -i again using the command below.

$ git reset a88f922c23b6ace989cb28e5933727fdb4e172f9
$ git rebase -i HEAD~2

Could you please share here the results of the top two commits from your git log after re-running the git rebase -i command without doing a git push?

[EmpChan]

Thank for your time!
This is commit message of my git log

[gichoel]

The results of the git reset and git rebase -i commands seem to be successful, but the commit message after git squash is not what I wanted.

I should have removed the unnecessary part of the commit that starts with delete spaces... You can modify the git commit message by running the following command.

$ git commit --amend

The above command will open a window to edit the commit message, remove the unnecessary commits from the line starting with delete spaces to the next five lines, including the blank line, and save it.

Then run git log again and you should see that there are no lines starting with delete spaces, at which point try running git push

[EmpChan]

I pushed with out delete spaces message.
Thank you!!

[honggyukim]

Hi @EmpChan, I'm sorry that I missed your PR and pushed 4afc58f into master, which includes your findings regarding --trace and --no-args.

Could you please update this PR without those changes?

[EmpChan]

Hello @honggyukim. I'm checked and change my commit. Thanks for opportunity to contribute this project!!

[honggyukim]

Thanks but I still see the conflict so please rebase your change based on the current master.

[EmpChan]

I try next steps but i dont know how rebase it.. I cant find my commit "Merge branch 'master' into master" even in git log

1. Resolve on github
2. git fetch origin <- in this step, i cant find my commit so try to re clone my repository
3. git reset b3ba3df5a2d9ad1806156b1cfe1752615036a805 -> (result : fatal: Could not parse object 'b3ba3df5a2d9ad1806156b1cfe1752615036a805'.)

how can i resolve it ?

[namhyung]

You need to have real uftrace repo in your remote branch. I assume you have your change at HEAD (check if git show will print your commit).

And this can be done just once.

$ git remote add main https://github.com/namhyung/uftrace

After that you can run this command to rebase.

$ git remote update
$ git branch -u main/master
$ git rebase