bhmt.dev / tangled.org__core
forked from tangled.org/core
Monorepo for Tangled
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

knotserver: remove `--allow-empty` from `git am`

Signed-off-by: oppiliappan <me@oppi.li>

oppiliappan 06bd1ce0 5075cefa

+1 -1
+1 -1
knotserver/git/merge.go
··· 237 237 } 238 238 239 239 var stderr bytes.Buffer 240 - cmd := exec.Command("git", "-C", g.path, "am", "--allow-empty", tmpPatch) 240 + cmd := exec.Command("git", "-C", g.path, "am", tmpPatch) 241 241 cmd.Stderr = &stderr 242 242 243 243 head, err := g.r.Head()