projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fa06d44) | patch
[PATCH] Better error message from checkout-cache for unmerged files.
authorJunio C Hamano <junkio@cox.net>
Sun, 17 Apr 2005 17:02:21 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 17 Apr 2005 17:02:21 +0000 (10:02 -0700)
commita38800fde24a44b12a9ed14852339466de1cb9c9
tree3698891b68fda449e3ba7fe859a5b65d54e60c79tree | snapshot
parentfa06d442c6c5113fcff9991f349157bdb0c4b989commit | diff
[PATCH] Better error message from checkout-cache for unmerged files.

The checkout-cache command says "file is not in the cache" when
an unmerged path is given.  This patch adds code to distinguish
the unmerged and the nonexistent cases and gives an appropriate
error message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
checkout-cache.c diff | blob | history
The core git plumbing