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

fix(record): don't add new files with no selected contents #1013

Merged
merged 3 commits into from
Aug 3, 2023
Merged

fix(record): don't add new files with no selected contents #1013

merged 3 commits into from
Aug 3, 2023

Conversation

arxanas
Copy link
Owner

@arxanas arxanas commented Jul 30, 2023 •
edited
Loading

Closes #995.

@arxanas arxanas mentioned this pull request Jul 30, 2023
Closed
kamalmarhubi added a commit to kamalmarhubi/dotfiles-nix that referenced this pull request Jul 31, 2023
@kamalmarhubi
scm-diff-editor: Switch to branch that fixes jj split
63577a5 
See
- martinvonz/jj#1916
- arxanas/git-branchless#995
- arxanas/git-branchless#1013
kamalmarhubi added a commit to kamalmarhubi/dotfiles-nix that referenced this pull request Jul 31, 2023
@kamalmarhubi
scm-diff-editor: Switch to branch that fixes jj split with empty files
1a2c75d 
See
- martinvonz/jj#1916
- arxanas/git-branchless#995
- arxanas/git-branchless#1013
@arxanas arxanas marked this pull request as ready for review July 31, 2023 03:30
@arxanas arxanas enabled auto-merge (rebase) August 3, 2023 00:47
@arxanas arxanas merged commit 9490091 into master Aug 3, 2023
13 checks passed
@arxanas arxanas deleted the arxanas/record branch August 3, 2023 01:06
arxanas added a commit to martinvonz/jj that referenced this pull request Nov 1, 2023
@arxanas
wip: upgrade version of scm-record
f05468d 
To get the fix at arxanas/git-branchless#1013 "fix(record): don't add new files with no selected contents".
arxanas added a commit to martinvonz/jj that referenced this pull request Dec 25, 2023
@arxanas
wip: upgrade version of scm-record
3aec9ea 
To get the fix at arxanas/git-branchless#1013 "fix(record): don't add new files with no selected contents".
arxanas added a commit to martinvonz/jj that referenced this pull request Dec 25, 2023
@arxanas
merge_tools: upgrade to scm-record v0.2.0
9be0bf7 
To get the fix at arxanas/git-branchless#1013 "fix(record): don't add new files with no selected contents".
arxanas added a commit to martinvonz/jj that referenced this pull request Dec 27, 2023
@arxanas
merge_tools: upgrade to scm-record v0.2.0
88cc4da 
To get the fix at arxanas/git-branchless#1013 "fix(record): don't add new files with no selected contents".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

scm-diff-editor cannot select empty files when using 'jj split'
1 participant
@arxanas