Skip to content

Commit

Permalink
reword (#237)
Browse files Browse the repository at this point in the history
  • Loading branch information
spaette authored Aug 23, 2024
1 parent 8bc412f commit 8bf7ccc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ VignetteBuilder:
knitr
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.2
SystemRequirements: libgit2 (>= 1.0): libgit2-devel (rpm) or libgit2-dev (deb)
Language: en-US
6 changes: 3 additions & 3 deletions R/rebase.R
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ git_rebase <- function(upstream, commit_changes, repo){

#' Reset your repo to a previous state
#'
#' * `git_reset_hard()` reverts to a point in history
#' * `git_reset_soft()` uncommits changes, but keeps the chsange uncommited
#' * `git_reset_mixed()` performs a simple `git reset`.
#' * `git_reset_hard()` resets the index and working tree
#' * `git_reset_soft()` does not touch the index file or the working tree
#' * `git_reset_mixed()` resets the index but not the working tree.
#'
#' @family git
#' @inheritParams git_rebase
Expand Down
3 changes: 1 addition & 2 deletions man/gert-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/git_reset.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8bf7ccc

Please sign in to comment.