File tree Expand file tree Collapse file tree 3 files changed +2
-6
lines changed Expand file tree Collapse file tree 3 files changed +2
-6
lines changed Original file line number Diff line number Diff line change @@ -524,7 +524,7 @@ pub struct StashIntoBranchParams {
524
524
525
525
/// This API allows the user to quickly "stash" a bunch of uncommitted changes - getting them out of the worktree.
526
526
/// Unlike the regular stash, the user specifies a new branch where those changes will be 'saved'/committed.
527
- /// Immediatelly after the changes are committed, the branch is unapplied from the workspace, and the "stash" branch can be re-applied at a later time
527
+ /// Immediately after the changes are committed, the branch is unapplied from the workspace, and the "stash" branch can be re-applied at a later time
528
528
/// In theory it should be possible to specify an existing "dumping" branch for this, but currently this endpoint expects a new branch.
529
529
pub fn stash_into_branch (
530
530
app : & App ,
Original file line number Diff line number Diff line change @@ -2,10 +2,6 @@ use gix::status::index_worktree;
2
2
3
3
/// Creates a tree containing the uncommited changes in the project.
4
4
/// This includes files in the index that are considered conflicted.
5
- ///
6
- /// TODO: This is a copy of `create_wd_tree` from the old world. Ideally we
7
- /// should share between the old and new worlds to prevent duplication beween
8
- /// these.
9
5
pub fn create_wd_tree (
10
6
repo : & gix:: Repository ,
11
7
untracked_limit_in_bytes : u64 ,
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ pub mod commands;
33
33
34
34
const UNCOMMITTED_CHANGES_REF : & str = "refs/gitbutler/edit-uncommitted-changes" ;
35
35
36
- /// Returns an index of the the tree of `commit` if it is unconflicted, *or* produce a merged tree
36
+ /// Returns an index of the tree of `commit` if it is unconflicted, *or* produce a merged tree
37
37
/// if `commit` is conflicted. That tree is turned into an index that records the conflicts that occurred
38
38
/// during the merge.
39
39
fn get_commit_index ( repository : & git2:: Repository , commit : & git2:: Commit ) -> Result < git2:: Index > {
You can’t perform that action at this time.
0 commit comments