summaryrefslogtreecommitdiffstats
path: root/pkg/commands/git.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-01-07 20:12:36 +1100
committerJesse Duffield <jessedduffield@gmail.com>2020-01-07 20:26:01 +1100
commiteb2bfd3848bc5178670380f77b675a27d94d2515 (patch)
tree7cc71d45667144061a9ced2cc1b9e04afa1a0d45 /pkg/commands/git.go
parentadb5c8fe06107c01003c444c4636f19713ea9404 (diff)
allow hard resetting to upstream branch
Diffstat (limited to 'pkg/commands/git.go')
-rw-r--r--pkg/commands/git.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkg/commands/git.go b/pkg/commands/git.go
index 08eb78edf..ab71f80e3 100644
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -265,7 +265,7 @@ func includesInt(list []int, a int) bool {
// ResetAndClean removes all unstaged changes and removes all untracked files
func (c *GitCommand) ResetAndClean() error {
- if err := c.ResetHardHead(); err != nil {
+ if err := c.ResetHard("HEAD"); err != nil {
return err
}
@@ -961,14 +961,14 @@ func (c *GitCommand) RemoveUntrackedFiles() error {
return c.OSCommand.RunCommand("git clean -fd")
}
-// ResetHardHead runs `git reset --hard HEAD`
-func (c *GitCommand) ResetHardHead() error {
- return c.OSCommand.RunCommand("git reset --hard HEAD")
+// ResetHardHead runs `git reset --hard`
+func (c *GitCommand) ResetHard(ref string) error {
+ return c.OSCommand.RunCommand("git reset --hard " + ref)
}
-// ResetSoftHead runs `git reset --soft HEAD`
-func (c *GitCommand) ResetSoftHead() error {
- return c.OSCommand.RunCommand("git reset --soft HEAD")
+// ResetSoft runs `git reset --soft HEAD`
+func (c *GitCommand) ResetSoft(ref string) error {
+ return c.OSCommand.RunCommand("git reset --soft " + ref)
}
// DiffCommits show diff between commits