index a66b2d73c50a99ff7beee379eaff330ab940a036..0c00090a6b95662fff38baafaaa892ab65e25609 100644 (file)
SYNOPSIS
--------
+[verse]
'git-rebase' [-v] [--merge] [-C<n>] [--onto <newbase>] <upstream> [<branch>]
-
'git-rebase' --continue | --skip | --abort
DESCRIPTION
typically this would be done with
- git update-index <filename>
+ git add <filename>
After resolving the conflict manually and updating the index with the
GIT
---
Part of the gitlink:git[7] suite
-