fcadf9608b
squashing: recommend --keep-base when squashing without a conflict ( #2157 )
2024-12-07 06:59:23 +08:00
8df3580d08
Spell out `git submodule deinit -f --all` ( #2153 )
2024-12-02 12:45:30 +08:00
54c6a86858
Explain how to deal with exploded git submodules ( #2152 )
2024-12-02 12:38:56 +08:00
e3451dc015
Describe `.git-blame-ignore-rev`
2024-09-24 19:51:44 +02:00
e69bb74b2e
docs: document hard-resetting submodules
2024-06-19 20:14:28 +02:00
27f021bcb5
Fix broken link
2024-05-16 04:53:03 +02:00
69c820a470
Fix some comments
...
Signed-off-by: JohnEndson <jiayuzhen@outlook.com>
2024-03-28 13:58:43 +02:00
e8ff7a3703
Make git rebase commands more bulletproof ( #1889 )
2024-02-14 19:00:15 -03:00
654fd475d0
1675 move 'failed to push some refs' into its own section
2023-08-30 10:02:41 +02:00
d01b87184f
1675 add a 'Squash your commits' header to 'Advanced Rebasing' section in git
2023-08-30 10:02:41 +02:00
9e6c3595c2
refactor(git.md) use `<>` instead of long `[...](...)` syntax for plain links
2023-07-22 14:16:37 +02:00
38b12730c8
refactor(git.md): make git-scm links clickable
...
Some of them wasn't clickable.
2023-07-22 14:16:37 +02:00
2eb3e5e7e8
fix(git.md): remove a confusing end of sentence character
...
It might cause a confusion since it is not end of a sentence.
2023-07-21 16:57:54 +02:00
f5cd03f2ec
linked issue is closed ( #1729 )
2023-07-13 04:02:06 +09:00
e2487ebdc4
Change `x.py` into `x`, add explanation for `x`
2023-06-30 23:11:14 +02:00
a04ad82e3c
Change `./x.py` into `./x`
2023-06-30 23:11:14 +02:00
088c7fec78
Document how to ignore specific files in a diff ( #1668 )
2023-04-09 12:07:16 +09:00
2b94321e3d
Improve git submodule help ( #1587 )
2023-02-09 19:08:26 +09:00
e574dadba0
fix rebase link
2023-01-10 08:17:59 +02:00
48ef16204c
Add a section for how to review code more easily ( #1538 )
...
- How to hide whitespace
- Fetching PRs without having to add a new remote or copy-paste the URL of the author's fork
- How to review large blocks that have moved
- Suggest `git range-diff`. This section is still mostly incomplete; fixing an exact command that will work seems kinda tricky and I don't currently have time for it.
2023-01-02 15:35:09 -08:00
3b35c4e040
fix typo
...
Co-authored-by: Noah Lev <camelidcamel@gmail.com>
2022-12-31 23:20:47 -06:00
3093967547
Give help for when you update a submodule by accident
2022-12-31 23:20:47 -06:00
7f9af30e5f
Use `origin` consistently and add an example of rebasing over the wrong remote
2022-12-29 11:39:24 -06:00
d318386762
Add more rebasing help
2022-12-29 11:39:24 -06:00
3a21e559be
miri is no longer a submodule but a subtree. ( #1488 )
2022-10-23 08:17:08 +09:00
4123cb2cd9
Update for removal of RLS ( #1450 )
2022-09-02 23:03:15 +09:00
51be0fd27d
Update the date reference around Git submodule bug ( #1430 )
2022-08-17 17:07:40 +09:00
8194045511
make date-check more lightweight ( #1394 )
...
* make date-check lightweight
This avoids having to write the date twice when updating date-check.
Before "As of <-- 2022-07 --> July 2022"
After "As of July 2022"
* please clippy
* update date-check docs
* accept review suggestion
Co-authored-by: Noah Lev <camelidcamel@gmail.com>
* address review comment
https://github.com/rust-lang/rustc-dev-guide/pull/1394#pullrequestreview-1042163557
* accept review suggestion
Co-authored-by: Noah Lev <camelidcamel@gmail.com>
* address review comment
https://github.com/rust-lang/rustc-dev-guide/pull/1394#pullrequestreview-1042167261
* address review comment
https://github.com/rust-lang/rustc-dev-guide/pull/1394#issuecomment-1189105017
* this breaks markdown
* address review comment
https://github.com/rust-lang/rustc-dev-guide/pull/1394#discussion_r934018268
This led to a more robust regex, though making the tool more picky.
It also found a wrong date format that was missed.
* address review comment
https://github.com/rust-lang/rustc-dev-guide/pull/1394#discussion_r934018419
* address review comment
https://github.com/rust-lang/rustc-dev-guide/pull/1394#discussion_r934018816
* accept review suggestion
This was reverted by mistake
Co-authored-by: Noah Lev <camelidcamel@gmail.com>
* address review comment
https://github.com/rust-lang/rustc-dev-guide/pull/1394#discussion_r934019395
* use a more simple fn
* address review comment
https://github.com/rust-lang/rustc-dev-guide/pull/1394#discussion_r934018981
Much more clean
* nit
* accept review suggestion
Co-authored-by: Noah Lev <camelidcamel@gmail.com>
* avoid a failed regex
Also, test new shape
* adjust to new regex (which uses named groups)
New regex was introduced by 456008cc35
2022-08-02 13:50:32 -07:00
8d227efda1
rust-analyzer is now a subtree
...
It used to be a submodule.
cf. https://github.com/rust-lang/rust/pull/99603
2022-07-25 11:40:28 +02:00
6ec2a84d4d
Update some links and docs ( #1340 )
2022-05-17 07:54:45 +09:00
3e67d8ee9a
Triage some date references ( #1293 )
2022-02-10 17:34:23 -03:00
0f68c8e315
git.md: Expanded a note to try to stress what you need to do if you're playing
...
games with submodules.
(I overlooked this when cherry-picking an LLVM commit today, and wasted some
time wondering why I wasn't seeing any effect in my resulting `rustc` build...)
2022-01-26 14:01:40 -08:00
e1babf580d
Unify `x.py` usage ( #1258 )
2021-11-16 07:44:50 +09:00
363f6ce09c
Spelling fixes
2021-11-15 08:23:01 -06:00
ef35a84098
Clarify paragraph in "Keeping things up to date"
2021-09-08 12:36:10 -05:00
f0900b2e0f
git.md: Fix No-Merge Policy link
2021-07-28 09:45:23 -04:00
1d25c44b9a
Update around half of the January 2021 date references ( #1155 )
2021-07-02 10:43:34 +02:00
5e61e50c17
move 7/8 to prose
2021-06-09 14:43:20 -04:00
7bfcf8763b
Add a section on keeping things up to date in the git section
2021-06-09 14:43:20 -04:00
2d3cc2a192
update rustfmt references to reflect change from submod to subtree ( #1129 )
...
* update rustfmt references to reflect change to subtree
* clarify broken toolstate hypothetical scenario
2021-05-20 15:02:20 +02:00
9ba3b4b62c
Suggest using `git range-diff` ( #1092 )
...
I have found it to be very helpful when rebasing.
2021-04-27 12:35:37 -07:00
126ea58714
Complete unfinished statement
2021-03-11 13:01:44 -05:00
f7049a868c
Fix date-check comment formatting ( #1066 )
...
I realized that the format I had been previously using for date-checks
(as of January 2021 <!-- date: 2021-01 -->)
left a space before the closing parenthesis in the rendered output,
which looks weird.
I could fix this by removing the space between `2021` and `<!-- ...`,
but that looks weird in the source. So I ended up deciding on changing
it to
(as of <!-- date: 2021-01 --> January 2021)
2021-02-20 19:24:01 -08:00
4f0142ce11
Make "URL" show up ( #1065 )
...
* Make "URL" show up
* Use `<URL>`
Co-authored-by: Léo Lanteri Thauvin <leseulartichaut@gmail.com>
2021-02-20 13:58:22 +01:00
6e02970f7f
Add lots of date-check annotations
...
Also added dates for things that previously said "as of now" or "as of
this writing" and cleaned up a couple of things along the way.
2021-02-03 19:29:07 -05:00
7a80b01e01
Add mdbook-toc, markers, and documentation ( #1028 )
...
* Add mdbook-toc to travis, book.toml and documentation
* Add toc markers
* Whitespace cleanup and some punctuation
* Addressed comments
2021-01-20 14:33:11 -03:00
cd437dc04f
Add context to dated information ( #1013 )
...
* Fixes #924 Add context to dated information
* Fixes #924 Addressed comments and some uses of 'currently'
* Update src/contributing.md
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
* Update src/salsa.md
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
* Fixes #924 Addressed comments
* Fixes #924 Fixed line lengths.
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
2021-01-10 19:23:22 -03:00
844ca6f14d
Don't imply that the name of the fork always needs to be changed
2020-11-29 10:42:20 -05:00
1f25130a83
Add information about common git issues
2020-11-29 10:42:20 -05:00
2b1e754e83
Fix a link on git.md
2020-10-15 23:11:33 -04:00
Ralf Jung
许杰友 Jieyou Xu (Joe)
许杰友 Jieyou Xu (Joe)
gstjepan2
JohnEndson
Jakub Beránek
zahash
İsmail Arılık
Tshepang Mbambo
sslime336
jyn
oskgo
Luqman Aden
Eric Huss
Amos Wenger
Yuki Okushi
Yuki Okushi
Felix S. Klock II
Ken Matsui
Lucas Kent
Noah Lev
Dave
Ryan Levick
Gus Wynn
Caleb Cartwright
Santiago Pastorino
r00ster
Iñaki Garay
Joshua Nelson
Yuki Okushi