diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-04-05 23:08:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-04-05 23:08:03 +0000 |
| commit | 47ea30e85eb01718d47adb2ef1ae073295cdcc7d (patch) | |
| tree | 0544b21e7cd245d7be3c58724d48d401f64fa9d4 /git-commit.txt | |
| parent | bfe9e75ebe8d3a83be46406130c76d54f8b14289 (diff) | |
| download | git-htmldocs-47ea30e85eb01718d47adb2ef1ae073295cdcc7d.tar.gz | |
Autogenerated HTML docs for v1.3.0-rc2-g6cbd5
Diffstat (limited to 'git-commit.txt')
| -rw-r--r-- | git-commit.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-commit.txt b/git-commit.txt index 2af472a56..0a7365b9a 100644 --- a/git-commit.txt +++ b/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 |