Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Suggest using git range-diff #1092

Merged
merged 1 commit into from
Apr 27, 2021
Merged

Suggest using git range-diff #1092

merged 1 commit into from
Apr 27, 2021

Conversation

camelid
Copy link
Member

@camelid camelid commented Mar 23, 2021

I have found it to be very helpful when rebasing.

@camelid camelid added the S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content label Mar 23, 2021
jyn514
jyn514 reviewed Mar 24, 2021
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great suggestion, thanks!

src/git.md Outdated Show resolved Hide resolved
@jyn514 jyn514 added S-waiting-on-author Status: this PR is waiting for additional action by the OP and removed S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content labels Mar 24, 2021
@jyn514
Copy link
Member

jyn514 commented Mar 24, 2021

I actually suggested that github do this by default, but I don't know how to get in contact with them. The 'issues' repo seems to be mostly ignored. isaacs/github#1834

@camelid
Copy link
Member Author

camelid commented Mar 24, 2021

I actually suggested that github do this by default, but I don't know how to get in contact with them. The 'issues' repo seems to be mostly ignored. isaacs/github#1834

Yeah, I have no idea how to contact them either.

@camelid camelid added S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content and removed S-waiting-on-author Status: this PR is waiting for additional action by the OP labels Mar 24, 2021
@camelid camelid force-pushed the range-diff branch 2 times, most recently from 9648401 to 4087d88 Compare March 25, 2021 23:20
jyn514
jyn514 reviewed Mar 26, 2021
View reviewed changes
src/git.md Outdated Show resolved Hide resolved
jyn514
jyn514 approved these changes Mar 27, 2021
View reviewed changes
src/git.md Outdated Show resolved Hide resolved
src/git.md Outdated Show resolved Hide resolved
@jyn514 jyn514 added S-waiting-on-author Status: this PR is waiting for additional action by the OP and removed S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content labels Apr 26, 2021
@jyn514
Copy link
Member

jyn514 commented Apr 26, 2021

Hi @camelid, are you planning to follow up on this?

@camelid
Copy link
Member Author

camelid commented Apr 27, 2021 •
edited
Loading

Hi @camelid, are you planning to follow up on this?

Yes, somehow I missed that this was waiting on me. Thanks for pinging me! I left responses to your comments.

@camelid camelid added S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content and removed S-waiting-on-author Status: this PR is waiting for additional action by the OP labels Apr 27, 2021
@jyn514 jyn514 added S-waiting-on-author Status: this PR is waiting for additional action by the OP and removed S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content labels Apr 27, 2021
@camelid camelid added S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content and removed S-waiting-on-author Status: this PR is waiting for additional action by the OP labels Apr 27, 2021
@camelid camelid force-pushed the range-diff branch 2 times, most recently from a02b030 to 9974834 Compare April 27, 2021 17:47
jyn514
jyn514 approved these changes Apr 27, 2021
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with the typo fixed, thanks for working on this :)

src/git.md Outdated Show resolved Hide resolved
@camelid
Suggest using git range-diff
708f63c 
I have found it to be very helpful when rebasing.
@camelid camelid merged commit e72b43a into rust-lang:master Apr 27, 2021
@camelid camelid deleted the range-diff branch April 27, 2021 19:35
@ehuss ehuss mentioned this pull request Apr 28, 2021
Merged
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Apr 28, 2021
@m-ou-se
Rollup merge of rust-lang#84668 - ehuss:update-books, r=ehuss
f781a19 
Update books

## reference

5 commits in e1abb17cd94cd5a8a374b48e1bc8134a2208ed48..d23f9da8469617e6c81121d9fd123443df70595d
2021-04-07 08:09:48 -0700 to 2021-04-28 11:16:44 -0700
- Document or-patterns (rust-lang/reference#957)
- fixed a typo in traits.md (rust-lang/reference#1009)
- Improve clarity and style consistency of crate type list (rust-lang/reference#1005)
- added macro_rules to weak keywords (rust-lang/reference#1008)
- Move non-ascii-idents content from unstable book to reference. (rust-lang/reference#999)

## book

1 commits in b54090a99ec7c4b46a5203a9c927fdbc311bb1f5..50dd06cb71beb27fdc0eebade5509cdcc1f821ed
2021-03-24 11:21:46 -0500 to 2021-04-23 13:21:54 -0500
- Update link in COPYRIGHT (http to https) (rust-lang/book#2704)

## rust-by-example

3 commits in c80f0b09fc15b9251825343be910c08531938ab2..e0a721f5202e6d9bec0aff99f10e44480c0da9e7
2021-04-08 10:28:17 -0300 to 2021-04-27 09:32:15 -0300
- broken long comments in src/types/cast.md to several shortones (rust-lang/rust-by-example#1430)
- Fix link of formatting traits (rust-lang/rust-by-example#1410)
- chore: Fix the indention of Borrowed definition (rust-lang/rust-by-example#1436)

## rustc-dev-guide

8 commits in a9bd2bbf31e4f92b5d3d8e80b22839d0cc7a2022..e72b43a64925ce053dc7830e21c1a57ba00499bd
2021-04-09 18:12:21 -0400 to 2021-04-27 12:35:37 -0700
- Suggest using `git range-diff` (rust-lang/rustc-dev-guide#1092)
- Remove the possible unnecessary flag
- Replace some Travis-related things completely
- Trigger GHA only on the original repo
- Add sample nix shell
- more RA config suggestions (rust-lang/rustc-dev-guide#1114)
- Add Polymorphisation paper (rust-lang/rustc-dev-guide#1093)
- Mention unpretty=mir-cfg for debugging MIR
jackh726 added a commit to jackh726/rust that referenced this pull request Apr 28, 2021
@jackh726
Rollup merge of rust-lang#84668 - ehuss:update-books, r=ehuss
fff2979 
Update books

## reference

5 commits in e1abb17cd94cd5a8a374b48e1bc8134a2208ed48..d23f9da8469617e6c81121d9fd123443df70595d
2021-04-07 08:09:48 -0700 to 2021-04-28 11:16:44 -0700
- Document or-patterns (rust-lang/reference#957)
- fixed a typo in traits.md (rust-lang/reference#1009)
- Improve clarity and style consistency of crate type list (rust-lang/reference#1005)
- added macro_rules to weak keywords (rust-lang/reference#1008)
- Move non-ascii-idents content from unstable book to reference. (rust-lang/reference#999)

## book

1 commits in b54090a99ec7c4b46a5203a9c927fdbc311bb1f5..50dd06cb71beb27fdc0eebade5509cdcc1f821ed
2021-03-24 11:21:46 -0500 to 2021-04-23 13:21:54 -0500
- Update link in COPYRIGHT (http to https) (rust-lang/book#2704)

## rust-by-example

3 commits in c80f0b09fc15b9251825343be910c08531938ab2..e0a721f5202e6d9bec0aff99f10e44480c0da9e7
2021-04-08 10:28:17 -0300 to 2021-04-27 09:32:15 -0300
- broken long comments in src/types/cast.md to several shortones (rust-lang/rust-by-example#1430)
- Fix link of formatting traits (rust-lang/rust-by-example#1410)
- chore: Fix the indention of Borrowed definition (rust-lang/rust-by-example#1436)

## rustc-dev-guide

8 commits in a9bd2bbf31e4f92b5d3d8e80b22839d0cc7a2022..e72b43a64925ce053dc7830e21c1a57ba00499bd
2021-04-09 18:12:21 -0400 to 2021-04-27 12:35:37 -0700
- Suggest using `git range-diff` (rust-lang/rustc-dev-guide#1092)
- Remove the possible unnecessary flag
- Replace some Travis-related things completely
- Trigger GHA only on the original repo
- Add sample nix shell
- more RA config suggestions (rust-lang/rustc-dev-guide#1114)
- Add Polymorphisation paper (rust-lang/rustc-dev-guide#1093)
- Mention unpretty=mir-cfg for debugging MIR
jackh726 added a commit to jackh726/rust that referenced this pull request Apr 29, 2021
@jackh726
Rollup merge of rust-lang#84668 - ehuss:update-books, r=ehuss
2c34c15 
Update books

## reference

5 commits in e1abb17cd94cd5a8a374b48e1bc8134a2208ed48..d23f9da8469617e6c81121d9fd123443df70595d
2021-04-07 08:09:48 -0700 to 2021-04-28 11:16:44 -0700
- Document or-patterns (rust-lang/reference#957)
- fixed a typo in traits.md (rust-lang/reference#1009)
- Improve clarity and style consistency of crate type list (rust-lang/reference#1005)
- added macro_rules to weak keywords (rust-lang/reference#1008)
- Move non-ascii-idents content from unstable book to reference. (rust-lang/reference#999)

## book

1 commits in b54090a99ec7c4b46a5203a9c927fdbc311bb1f5..50dd06cb71beb27fdc0eebade5509cdcc1f821ed
2021-03-24 11:21:46 -0500 to 2021-04-23 13:21:54 -0500
- Update link in COPYRIGHT (http to https) (rust-lang/book#2704)

## rust-by-example

3 commits in c80f0b09fc15b9251825343be910c08531938ab2..e0a721f5202e6d9bec0aff99f10e44480c0da9e7
2021-04-08 10:28:17 -0300 to 2021-04-27 09:32:15 -0300
- broken long comments in src/types/cast.md to several shortones (rust-lang/rust-by-example#1430)
- Fix link of formatting traits (rust-lang/rust-by-example#1410)
- chore: Fix the indention of Borrowed definition (rust-lang/rust-by-example#1436)

## rustc-dev-guide

8 commits in a9bd2bbf31e4f92b5d3d8e80b22839d0cc7a2022..e72b43a64925ce053dc7830e21c1a57ba00499bd
2021-04-09 18:12:21 -0400 to 2021-04-27 12:35:37 -0700
- Suggest using `git range-diff` (rust-lang/rustc-dev-guide#1092)
- Remove the possible unnecessary flag
- Replace some Travis-related things completely
- Trigger GHA only on the original repo
- Add sample nix shell
- more RA config suggestions (rust-lang/rustc-dev-guide#1114)
- Add Polymorphisation paper (rust-lang/rustc-dev-guide#1093)
- Mention unpretty=mir-cfg for debugging MIR
jackh726 added a commit to jackh726/rust that referenced this pull request Apr 29, 2021
@jackh726
Rollup merge of rust-lang#84668 - ehuss:update-books, r=ehuss
5d2ac6f 
Update books

## reference

5 commits in e1abb17cd94cd5a8a374b48e1bc8134a2208ed48..d23f9da8469617e6c81121d9fd123443df70595d
2021-04-07 08:09:48 -0700 to 2021-04-28 11:16:44 -0700
- Document or-patterns (rust-lang/reference#957)
- fixed a typo in traits.md (rust-lang/reference#1009)
- Improve clarity and style consistency of crate type list (rust-lang/reference#1005)
- added macro_rules to weak keywords (rust-lang/reference#1008)
- Move non-ascii-idents content from unstable book to reference. (rust-lang/reference#999)

## book

1 commits in b54090a99ec7c4b46a5203a9c927fdbc311bb1f5..50dd06cb71beb27fdc0eebade5509cdcc1f821ed
2021-03-24 11:21:46 -0500 to 2021-04-23 13:21:54 -0500
- Update link in COPYRIGHT (http to https) (rust-lang/book#2704)

## rust-by-example

3 commits in c80f0b09fc15b9251825343be910c08531938ab2..e0a721f5202e6d9bec0aff99f10e44480c0da9e7
2021-04-08 10:28:17 -0300 to 2021-04-27 09:32:15 -0300
- broken long comments in src/types/cast.md to several shortones (rust-lang/rust-by-example#1430)
- Fix link of formatting traits (rust-lang/rust-by-example#1410)
- chore: Fix the indention of Borrowed definition (rust-lang/rust-by-example#1436)

## rustc-dev-guide

8 commits in a9bd2bbf31e4f92b5d3d8e80b22839d0cc7a2022..e72b43a64925ce053dc7830e21c1a57ba00499bd
2021-04-09 18:12:21 -0400 to 2021-04-27 12:35:37 -0700
- Suggest using `git range-diff` (rust-lang/rustc-dev-guide#1092)
- Remove the possible unnecessary flag
- Replace some Travis-related things completely
- Trigger GHA only on the original repo
- Add sample nix shell
- more RA config suggestions (rust-lang/rustc-dev-guide#1114)
- Add Polymorphisation paper (rust-lang/rustc-dev-guide#1093)
- Mention unpretty=mir-cfg for debugging MIR
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 approved these changes

Assignees
No one assigned
Labels
S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@camelid @jyn514