Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Tweaks to make asciidoc play nice.
author
Francis Daly
<francis@daoine.org>
Wed, 5 Apr 2006 22:25:17 +0000
(23:25 +0100)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 5 Apr 2006 22:46:54 +0000
(15:46 -0700)
Once the content has been generated, the formatting elves can reorder
it to be pretty...
Signed-off-by: Francis Daly <francis@daoine.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-commit.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
ae5d847
)
diff --git
a/Documentation/git-commit.txt
b/Documentation/git-commit.txt
index 2af472a5691007296ffb3a3c0921ab27e23e3884..0a7365b9a80ed0d134bccb3fbe4baacc59056423 100644
(file)
--- a/
Documentation/git-commit.txt
+++ b/
Documentation/git-commit.txt
@@
-83,15
+83,16
@@
OPTIONS
the current tip as parents -- so the current top commit is
discarded.
+
the current tip as parents -- so the current top commit is
discarded.
+
+--
It is a rough equivalent for:
It is a rough equivalent for:
-+
-------------
+------
$ git reset --soft HEAD^
$ ... do something else to come up with the right tree ...
$ git commit -c ORIG_HEAD
$ git reset --soft HEAD^
$ ... do something else to come up with the right tree ...
$ git commit -c ORIG_HEAD
-------------
-+
+
+------
but can be used to amend a merge commit.
but can be used to amend a merge commit.
+--
-i|--include::
Instead of committing only the files specified on the
-i|--include::
Instead of committing only the files specified on the