mirror of
https://github.com/git/git.git
synced 2024-11-17 20:54:01 +01:00
3ae854c356
Morten Welinder says examples of resetting is really about recovering from botched commit/pulls. I agree that pointers from commands that cause a reset to be needed in the first place would be very helpful. Also reset examples did not mention "pull/merge" cases. Signed-off-by: Junio C Hamano <junkio@cox.net>
82 lines
2.0 KiB
Plaintext
82 lines
2.0 KiB
Plaintext
git-commit(1)
|
|
=============
|
|
|
|
NAME
|
|
----
|
|
git-commit - Record your changes
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] [-e] [--] <file>...
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Updates the index file for given paths, or all modified files if
|
|
'-a' is specified, and makes a commit object. The command
|
|
VISUAL and EDITOR environment variables to edit the commit log
|
|
message.
|
|
|
|
This command can run `commit-msg`, `pre-commit`, and
|
|
`post-commit` hooks. See link:hooks.html[hooks] for more
|
|
information.
|
|
|
|
OPTIONS
|
|
-------
|
|
-a|--all::
|
|
Update all paths in the index file.
|
|
|
|
-c or -C <commit>::
|
|
Take existing commit object, and reuse the log message
|
|
and the authorship information (including the timestamp)
|
|
when creating the commit. With '-C', the editor is not
|
|
invoked; with '-c' the user can further edit the commit
|
|
message.
|
|
|
|
-F <file>::
|
|
Take the commit message from the given file. Use '-' to
|
|
read the message from the standard input.
|
|
|
|
-m <msg>::
|
|
Use the given <msg> as the commit message.
|
|
|
|
-s|--signoff::
|
|
Add Signed-off-by line at the end of the commit message.
|
|
|
|
-v|--verify::
|
|
Look for suspicious lines the commit introduces, and
|
|
abort committing if there is one. The definition of
|
|
'suspicious lines' is currently the lines that has
|
|
trailing whitespaces, and the lines whose indentation
|
|
has a SP character immediately followed by a TAB
|
|
character. This is the default.
|
|
|
|
-n|--no-verify::
|
|
The opposite of `--verify`.
|
|
|
|
-e|--edit::
|
|
The message taken from file with `-F`, command line with
|
|
`-m`, and from file with `-C` are usually used as the
|
|
commit log message unmodified. This option lets you
|
|
further edit the message taken from these sources.
|
|
|
|
--::
|
|
Do not interpret any more arguments as options.
|
|
|
|
<file>...::
|
|
Update specified paths in the index file before committing.
|
|
|
|
|
|
If you make a commit and then found a mistake immediately after
|
|
that, you can recover from it with gitlink:git-reset[1].
|
|
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org> and
|
|
Junio C Hamano <junkio@cox.net>
|
|
|
|
|
|
GIT
|
|
---
|
|
Part of the gitlink:git[7] suite
|