| commit | cbce6c0be30cbaf8c39051f85006d679338a8ddc | |
| author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | |
| Mon, 29 Sep 2008 16:04:41 +0000 (29 18:04 +0200) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Mon, 29 Sep 2008 16:13:20 +0000 (29 09:13 -0700) | ||
| tree | 9e8768427a54f37d0d0529c7d06cf6de92fa9489 | treesnapshot (tar.gz zip) |
| parent | 94e02e7f3b0504243b364ad04b58332bb1502934 | commitdiff |
Clarify commit error message for unmerged files
Currently, trying to use git-commit with unmerged files in the index
will show the message "Error building trees", which can be a bit
obscure to the end user. This patch makes the error message clearer, and
consistent with what git-write-tree reports in a similar situation.
Signed-off-by: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Currently, trying to use git-commit with unmerged files in the index
will show the message "Error building trees", which can be a bit
obscure to the end user. This patch makes the error message clearer, and
consistent with what git-write-tree reports in a similar situation.
Signed-off-by: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| builtin-commit.c | diffblobblamehistory |