diff options
| author | Stephan Dilly <dilly.stephan@gmail.com> | 2021-03-11 11:49:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-11 11:49:04 +0100 |
| commit | bfa240115cb497ec2ad9cacb40f0fc21481fb0ae (patch) | |
| tree | 7fb0aa51a98b984fdaa4a8b277e50fee8172bd01 /src/queue.rs | |
| parent | b5ef9b10f1e0e6e0c21a55d9083b4e40c1f759b8 (diff) | |
support rebase merge (conflict free only) (#567)
Diffstat (limited to 'src/queue.rs')
| -rw-r--r-- | src/queue.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/queue.rs b/src/queue.rs index 21da03fc..9df50d7b 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -31,7 +31,7 @@ pub enum Action { StashDrop(CommitId), DeleteBranch(String), ForcePush(String, bool), - PullMerge(usize), + PullMerge { incoming: usize, rebase: bool }, } /// |