diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2013-01-12 23:47:56 +0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2013-01-12 23:47:56 +0400 |
| commit | 25743bd7c5f14f2287d9c4fdf953c978e3b16916 (patch) | |
| tree | 7390d1d2d5d52f549329853903f381e58c1b1de6 /src/stash.c | |
| parent | e2d2c6e57d122f381fb42b7df1c7a12819050490 (diff) | |
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.c | 2 |
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; } |