diff options
| author |  Francis Daly <francis@daoine.org> | 2006-04-05 23:25:17 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-04-05 15:46:54 -0700 |
| commit | 6cbd5d7d79f5751828397558e7c3611b048565fb (patch) | |
| tree | 8d2af3754dac6daccc43ae1e853efebb8b8668c3 /Documentation/git-commit.txt | |
| parent | git-commit: document --amend (diff) | |
| download | tgif-6cbd5d7d79f5751828397558e7c3611b048565fb.tar.xz | |
Tweaks to make asciidoc play nice.
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>
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 2af472a569..0a7365b9a8 100644 --- 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. + +-- 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 |