-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
caefada
commit 1adbb71
Showing
9 changed files
with
102 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -303,7 +303,6 @@ After fetching changes, our log looks like this: | |
```console | ||
> jj git fetch | ||
> jj log | ||
> jj log | ||
@ xqkmpxlq [email protected] 2024-03-17 15:18:11.000 -05:00 fccf0626 | ||
│ (empty) (no description set) | ||
◉ xnutwmso [email protected] 2024-03-17 15:16:36.000 -05:00 da67dfe1 | ||
|
@@ -571,6 +570,4 @@ the tools you already know to do something completely different! We're going to | |
talk about a slightly different workflow next: "stacked pull requests". They're | ||
similar in some ways to this approach, but there's also some differences too. | ||
|
||
|
||
|
||
[my open PR]: https://github.com/steveklabnik/jj-hello-world/pull/1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,15 +36,34 @@ in `git` is that branches do not automatically move. For example, let's make a | |
new change: | ||
|
||
```console | ||
> jj log --limit 2 | ||
@ pzkrzopz [email protected] 2024-03-01 22:41:37.000 -06:00 fcf669c5 | ||
> jj new | ||
Working copy now at: moxnkoxx 3f14c03f (empty) (no description set) | ||
Parent commit : ytkvxlpy 7ec11c41 trunk | remove goodbye message | ||
> jj log | ||
@ moxnkoxx [email protected] 2024-03-17 17:10:57.000 -05:00 3f14c03f | ||
│ (empty) (no description set) | ||
◉ povouosx [email protected] 2024-03-01 18:12:43.000 -06:00 trunk f68d1623 | ||
│ ◉ qtlkpytx [email protected] 2024-03-17 17:09:25.000 -05:00 e6667f9e | ||
├─╯ (empty) (no description set) | ||
◉ ytkvxlpy [email protected] 2024-03-17 17:09:25.000 -05:00 trunk 7ec11c41 | ||
│ remove goodbye message | ||
~ | ||
``` | ||
|
||
Even though `@` has moved to `pzkrzopz`, `trunk` is still at `povouosx`. This | ||
Oh look, we have an extra empty commit lying around. That happens sometimes, | ||
let's forget about it: | ||
|
||
```console | ||
> jj abandon qt | ||
Abandoned commit qtlkpytx e6667f9e (empty) (no description set) | ||
> jj log --limit 3 | ||
@ moxnkoxx [email protected] 2024-03-17 17:10:57.000 -05:00 3f14c03f | ||
│ (empty) (no description set) | ||
◉ ytkvxlpy [email protected] 2024-03-17 17:09:25.000 -05:00 trunk 7ec11c41 | ||
│ remove goodbye message | ||
◉ krmulszn [email protected] 2024-03-17 17:06:59.000 -05:00 e98c1626 | ||
│ refactor printing | ||
``` | ||
|
||
Even though `@` has moved to `moxnkoxx`, `trunk` is still at `ytkvxlpy`. This | ||
behavior is a bit surprising for folks coming from `git`, though it fits in with | ||
`jj` more nicely, I think. | ||
|
||
|