diff options
Diffstat (limited to 'git-codereview/sync.go')
| -rw-r--r-- | git-codereview/sync.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-codereview/sync.go b/git-codereview/sync.go index dc03c61..f518a3f 100644 --- a/git-codereview/sync.go +++ b/git-codereview/sync.go @@ -33,11 +33,11 @@ func cmdSync(args []string) { run("git", "pull", "-q", "-r", "origin", strings.TrimPrefix(b.OriginBranch(), "origin/")) } - // If the change commit has been submitted, - // roll back change leaving any changes unstaged. - // Pull should have done this for us, but check just in case. b = CurrentBranch() // discard any cached information if len(b.Pending()) == 1 && b.Submitted(id) { + // If the change commit has been submitted, + // roll back change leaving any changes unstaged. + // Pull should have done this for us, but check just in case. run("git", "reset", b.Branchpoint()) } } |