Documentation/git-commit: reword the --amend explanation
The explanation for 'git commit --amend' talks about preparing a tree object, which shouldn't be how user-facing documentation talks about commit. Reword it to say it works as usual, but replaces the current commit. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
							parent
							
								
									15999998fb
								
							
						
					
					
						commit
						aa7b8c657e
					
				|  | @ -190,14 +190,15 @@ OPTIONS | |||
| 	without changing its commit message. | ||||
|  | ||||
| --amend:: | ||||
| 	Used to amend the tip of the current branch. Prepare the tree | ||||
| 	object you would want to replace the latest commit as usual | ||||
| 	(this includes the usual -i/-o and explicit paths), and the | ||||
| 	commit log editor is seeded with the commit message from the | ||||
| 	tip of the current branch. The commit you create replaces the | ||||
| 	current tip -- if it was a merge, it will have the parents of | ||||
| 	the current tip as parents -- so the current top commit is | ||||
| 	discarded. | ||||
| 	Replace the tip of the current branch by creating a new | ||||
| 	commit. The recorded tree is prepared as usual (including | ||||
| 	the effect of the `-i` and `-o` options and explicit | ||||
| 	pathspec), and the message from the original commit is used | ||||
| 	as the starting point, instead of an empty message, when no | ||||
| 	other message is specified from the command line via options | ||||
| 	such as `-m`, `-F`, `-c`, etc.  The new commit has the same | ||||
| 	parents and author as the current one (the `--reset-author` | ||||
| 	option can countermand this). | ||||
| + | ||||
| -- | ||||
| It is a rough equivalent for: | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Carlos Martín Nieto
						Carlos Martín Nieto