mirror of
https://github.com/zulip/zulip.git
synced 2025-11-10 08:56:10 +00:00
bdbc384de5
- Updated 260+ links from ".html" to ".md" to reduce the number of issues reported about hyperlinks not working when viewing docs on Github. - Removed temporary workaround that suppressed all warnings reported by sphinx build for every link ending in ".html". Details: The recent upgrade to recommonmark==0.5.0 supports auto-converting ".md" links to ".html" so that the resulting HTML output is correct. Notice that links pointing to a heading i.e. "../filename.html#heading", were not updated because recommonmark does not auto-convert them. These links do not generate build warnings and do not cause any issues. However, there are about ~100 such links that might still get misreported as broken links. This will be a follow-up issue. Background: docs: pip upgrade recommonmark and CommonMark #13013 docs: Allow .md links between doc pages #11719 Fixes #11087.
65 lines
1.3 KiB
Markdown
65 lines
1.3 KiB
Markdown
# Review changes
|
|
|
|
**Note** - The following section covers reviewing changes on your local
|
|
clone. Please read the section on [code reviews][zulip-rtd-review] for a guide
|
|
on reviewing changes by other contributors.
|
|
|
|
## Changes on (local) working tree
|
|
|
|
Display changes between index and working tree (what is not yet staged for commit):
|
|
|
|
```
|
|
$ git diff
|
|
```
|
|
|
|
Display changes between index and last commit (what you have staged for commit):
|
|
|
|
```
|
|
$ git diff --cached
|
|
```
|
|
|
|
Display changes in working tree since last commit (changes that are staged as
|
|
well as ones that are not):
|
|
|
|
```
|
|
$ git diff HEAD
|
|
```
|
|
|
|
## Changes within branches
|
|
|
|
Use any git-ref to compare changes between two commits on the current branch.
|
|
|
|
Display changes between commit before last and last commit:
|
|
|
|
```
|
|
$ git diff HEAD^ HEAD
|
|
```
|
|
|
|
Display changes between two commits using their hashes:
|
|
|
|
```
|
|
$ git diff e2f404c 7977169
|
|
```
|
|
|
|
## Changes between branches
|
|
|
|
Display changes between tip of topic branch and tip of master branch:
|
|
|
|
```
|
|
$ git diff topic master
|
|
```
|
|
|
|
Display changes that have occurred on master branch since topic branch was created:
|
|
|
|
```
|
|
$ git diff topic...master
|
|
```
|
|
|
|
Display changes you've committed so far since creating a branch from upstream/master:
|
|
|
|
```
|
|
$ git diff upstream/master...HEAD
|
|
```
|
|
|
|
[zulip-rtd-review]: ../contributing/code-reviewing.md
|