summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2006-12-21 19:48:32 -0500
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-21 22:59:34 -0800
commitfa39b6b5b11f9b580c515a7b4a8e4eb8eaa79b75 (patch)
tree1b01d4e00ef4367a922de3f7a0e553bff2266073 /git-merge-stupid.sh
parentRename imap-send's internal info/warn functions. (diff)
downloadtgif-fa39b6b5b11f9b580c515a7b4a8e4eb8eaa79b75.tar.xz
Introduce a global level warn() function.
Like the existing error() function the new warn() function can be used to describe a situation that probably should not be occuring, but which the user (and Git) can continue to work around without running into too many problems. An example situation is a bad commit SHA1 found in a reflog. Attempting to read this record out of the reflog isn't really an error as we have skipped over it in the past. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions