mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-06-03 10:04:59 +00:00
feature: support to enable --squash
and --push
option while finishing git-flow branches (#1290)
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
parent
e8bf58f6c3
commit
ebe0e61367
6 changed files with 47 additions and 6 deletions
|
@ -13,6 +13,18 @@ namespace SourceGit.ViewModels
|
|||
public bool IsRelease => _type == "release";
|
||||
public bool IsHotfix => _type == "hotfix";
|
||||
|
||||
public bool Squash
|
||||
{
|
||||
get;
|
||||
set;
|
||||
} = false;
|
||||
|
||||
public bool AutoPush
|
||||
{
|
||||
get;
|
||||
set;
|
||||
} = false;
|
||||
|
||||
public bool KeepBranch
|
||||
{
|
||||
get;
|
||||
|
@ -39,7 +51,7 @@ namespace SourceGit.ViewModels
|
|||
|
||||
return Task.Run(() =>
|
||||
{
|
||||
var succ = Commands.GitFlow.Finish(_repo.FullPath, _type, name, KeepBranch, log);
|
||||
var succ = Commands.GitFlow.Finish(_repo.FullPath, _type, name, Squash, AutoPush, KeepBranch, log);
|
||||
log.Complete();
|
||||
CallUIThread(() => _repo.SetWatcherEnabled(true));
|
||||
return succ;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue