Git Commit Command and Merge Resolution

you do: ------------ $ git commit ------------ this second commit would record the changes to `hello.c` and `hello.h` as expected. After a merge (initiated by `git merge` or `git pull`) stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with `git status` and after fixing them manually in your working tree, you would stage the result as usual with `git add`: ------------ $ git status | grep unmerged unmerged: hello.c $ edit hello.c $ git add hello.c ------------ After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge: ------------ $ git commit ------------ As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option). COMMIT INFORMATION ------------------ Author and committer information is taken from the following environment variables, if set: * `GIT_AUTHOR_NAME` * `GIT_AUTHOR_EMAIL` * `GIT_AUTHOR_DATE` * `GIT_COMMITTER_NAME` * `GIT_COMMITTER_EMAIL` * `GIT_COMMITTER_DATE` (nb "<", ">" and "\n"s are stripped) The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]. In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable `EMAIL`, or, if that is not set, system user name and the hostname

The git commit command is used to record changes after a merge, handling conflicts and staging resolved files, with options to save typing and specify commit information, including author and committer names and emails, which can be set through environment variables or configuration items.