Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7dc17f2

Browse files
authored
typo
1 parent e39f04f commit 7dc17f2

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

doc/src/rebasing.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
You should clean your branch's commits, and we have two approach for this.
2+
You should clean your branch's commits, and we have two approaches for this.
33

44
# Rebasing
55
```bash
@@ -56,9 +56,9 @@ Date: Sat Jul 30 15:46:28 2022 +0530
5656
Implementing tuples in LLVM backend
5757

5858
```
59-
here, we want make our commits as a bunch of batches.
59+
here, we want to make our commits as a bunch of batches.
6060

61-
we will rebasing with main with interactive option `git rebase main -i`.
61+
we will rebase with main with the interactive option `git rebase main -i`.
6262

6363
but first create a backup branch before doing this interactive rebase.
6464

@@ -111,8 +111,8 @@ s 122a02bf3 refactor
111111
s 663edf45b refactor
112112
...
113113
```
114-
and it will open windows for every change you made to rename commit's message.
115-
- first window to rename commit `Added add3.py` because we squashed the commit after it, and by default the message would be the original message of `Added add3.py` and messages of squashed commits, here i will not change anything i will leave message like that.
114+
and it will open windows for every change you made to rename the commit's message.
115+
- first window to rename commit `Added add3.py` because we squashed the commit after it, and by default the message would be the original message of `Added add3.py` and messages of squashed commits, here I will not change anything I will leave message like that.
116116
```bash
117117
# This is a combination of 2 commits.
118118
# This is the 1st commit message:
@@ -143,7 +143,7 @@ Refactor
143143
# Untracked files:
144144
...
145145
```
146-
- second window: rename(rewword) `Added add4.py`, you can edit the message as you want, i will rename it: `Added add4.py and edit it ` .
146+
- second window: rename(reword) `Added add4.py`, you can edit the message as you want, I will rename it: `Added add4.py and edit it ` .
147147
```
148148
Added add4.py
149149
@@ -187,7 +187,7 @@ Added add4.py and edit it
187187
# with '#' will be ignored, and an empty message aborts the commit.
188188
...
189189
```
190-
- third window will be the same as dirst one because of squashing two commits to commit:`Added add4.py`, i will leave it with out changing message.
190+
- third window will be the same as the first one because of squashing two commits to commit:`Added add4.py`, I will leave it without changing the message.
191191

192192
Log now:
193193
```bash
@@ -223,7 +223,7 @@ Date: Sat Jul 30 23:36:27 2022 +0200
223223
Added add.py
224224

225225
```
226-
and if you want to push to remote branch you must push with `--force` option.
226+
and if you want to push to the remote branch you must push with `--force` option.
227227

228228

229229
This [video](https://drive.google.com/file/d/1506h86_RLgwtjLi_uKWbdVNDsSVusIbr/view?usp=sharing) by *Naman Gera* he was rebasing a branch.
@@ -232,7 +232,7 @@ This [video](https://drive.google.com/file/d/1506h86_RLgwtjLi_uKWbdVNDsSVusIbr/v
232232
# Merging
233233
by *Gagandeep Singh* from [#783 comment](https://github.com/lcompilers/lpython/pull/783#issuecomment-1188875210)
234234

235-
Assuming initial state is your current branch (say `xyz_branch`),
235+
Assuming the initial state is your current branch (say `xyz_branch`),
236236

237237
1. git checkout main or git checkout master (whichever is being used in a certain project as the lead branch).
238238
2. git pull origin main (origin is the project remote say for lpython it will be pointing to (https://github.com/lcompilers/lpython).
@@ -243,4 +243,4 @@ Assuming initial state is your current branch (say `xyz_branch`),
243243
7. Repeat step 6 until you are satisfied with the group of changes you want to commit.
244244
8. `git commit -m "nice_commit_message"` or `git commit (and then write detailed commit message in the command line editor)`.
245245
9. Repeat 7 and 8 until all the changes are committed.
246-
10. `git push -f your_remote xyz_branch`.
246+
10. `git push -f your_remote xyz_branch`.

0 commit comments

Comments
 (0)