diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-02-17 12:43:42 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-17 21:20:27 +0300 |
| commit | d7f078b8b92b1a29f9dd62c2c470fa51e15e2ffa (patch) | |
| tree | 20f6c599862aaa92534de70cf76d7289e0b3aeea /Documentation/git-rebase.txt | |
| parent | 5ca2db53763ed93a75de7ddbda753fc09327d7aa (diff) | |
Convert update-index references in docs to add.
Since `git add` is the approved porcelain for an end-user to invoke
when they want to manipulate the index, porcelain documentation
should steer the user to this command rather than the pure plumbing
update-index.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index a66b2d73c5..2f417a8f85 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -148,7 +148,7 @@ file you edit, you need to tell git that the conflict has been resolved, typically this would be done with - git update-index <filename> + git add <filename> After resolving the conflict manually and updating the index with the |