summaryrefslogtreecommitdiff
path: root/src/stash.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2013-01-12 13:47:56 -0600
committerEdward Thomson <ethomson@edwardthomson.com>2013-01-12 13:47:56 -0600
commit25743bd7c5f14f2287d9c4fdf953c978e3b16916 (patch)
tree7390d1d2d5d52f549329853903f381e58c1b1de6 /src/stash.c
parente2d2c6e57d122f381fb42b7df1c7a12819050490 (diff)
downloadlibgit2-25743bd7c5f14f2287d9c4fdf953c978e3b16916.tar.gz
add an index_remove_bypath that removes conflicts, renamed add_from_workdir to match
Diffstat (limited to 'src/stash.c')
-rw-r--r--src/stash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/stash.c b/src/stash.c
index e63a362f0..d4f81aefe 100644
--- a/src/stash.c
+++ b/src/stash.c
@@ -208,7 +208,7 @@ static int update_index_cb(
}
if (add_path != NULL)
- data->error = git_index_add_from_workdir(data->index, add_path);
+ data->error = git_index_add_bypath(data->index, add_path);
return data->error;
}