summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ae5d847)
raw | patch | inline | side by side (parent: ae5d847)
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>
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 |
index 2af472a5691007296ffb3a3c0921ab27e23e3884..0a7365b9a80ed0d134bccb3fbe4baacc59056423 100644 (file)
the current tip as parents -- so the current top commit is
discarded.
+
+--
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
-------------
-+
+
+------
but can be used to amend a merge commit.
+--
-i|--include::
Instead of committing only the files specified on the