Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

docs: Fix typos in git cheat sheet documentation.

This commit is contained in:
Wyatt Hoodes 2019-08-07 15:32:39 -10:00 committed by Tim Abbott
parent 5df6065bed
commit 447f0d3f07
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/git/cheat-sheet.md
View File

@ -24,14 +24,14 @@ See also [fixing commits][fix-commit]
- `git fetch origin`
- `git fetch upstream`
- grep
- `git grep update_unread_counts
- `git grep update_unread_counts`
- log
- `git log`
- pull
- `git pull --rebase`: **Use this**. Zulip uses a [rebase oriented workflow][git-overview].
- `git pull` (with no options): Will either create a merge commit
(which you don't want) or do the same thing as `git pull --rebase`,
depending on [whether you're configured Git properly][git-clone-config]
depending on [whether you've configured Git properly][git-config-clone]
- push
- `git push origin +branch-name`
- rebase
@ -87,7 +87,7 @@ See also [fixing commits][fix-commit]
- `git pull --rebase`: rebase your changes on top of master.
- `git pull` (with no options): Will either create a merge commit
(which you don't want) or do the same thing as `git pull --rebase`,
depending on [whether you're configured Git properly][git-clone-config]
depending on [whether you've configured Git properly][git-config-clone]
- push
- `git push origin branch-name`: push you commits to the origin repository *only if* there are no conflicts.
Use this when collaborating with others to prevent overwriting their work.