gg

Git like Mercurial

gg add

gg add FILE [...]

add the specified files on the next commit

Mark files to be tracked under version control and added at the next commit. If add is run on a file X and X is ignored, it will be tracked. However, adding a directory with ignored files will not track the ignored files.

add also marks merge conflicts as resolved like git add.