go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

Add test for amending a merge commit

Browse Source
This commit is contained in:
Luka Markušić
2022-09-10 17:00:40 +02:00
parent 4c7d363959
commit 0141bbde0e
26 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/integration/components/shell.go
View File

@ -64,7 +64,7 @@ func (s *Shell) Checkout(name string) *Shell {
}
func (s *Shell) Merge(name string) *Shell {
return s.RunCommand("git merge --commit " + name)
return s.RunCommand("git merge --commit --no-ff " + name)
}
func (s *Shell) GitAdd(path string) *Shell {