From 0c394739d61d5a44ab03b6954780281b11b65933 Mon Sep 17 00:00:00 2001 From: Luke Plaster Date: Wed, 6 Jul 2016 15:23:38 +0800 Subject: [PATCH] docs: added Repo#ls_files --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9b33729..13fa604 100644 --- a/README.md +++ b/README.md @@ -144,9 +144,9 @@ with branch parameter specified: Uses `--porcelain` to parse repository status in a way that is agnostic of system language. `options` is a string of any other options you'd like to pass to the status command. For example, the `-u` option will list each file in an untracked directory rather than simply listing the directory itself. The callback receives `(err, status)`. See below for a definition of what `status` is. - -### `Repo#merge(name, [options, ]callback)` -`git merge ` + +### `Repo#ls_files([files, ]options, callback)` +List out the files in the index and working tree. Optionally filtered by a given array of `files` (paths or filenames). ### `Repo#config(callback)` `git config` parsed as a simple, one-level object. The callback receives `(err, config)`. @@ -168,6 +168,9 @@ with an error, if one occurred. ### `Repo#delete_branch(delete, callback)` Delete the branch `name`, and call the callback with an error, if one occurred. +### `Repo#merge(name, [options, ]callback)` +`git merge ` + ### `Repo#tags(callback)` Get a list of `Tag`s.