Revision c308b9c25d54c72977d16155ae04e37f3490d5ac authored by Will Palmer on 17 April 2010, 16:55:26 UTC, committed by Junio C Hamano on 17 April 2010, 18:50:32 UTC
The description for core.autocrlf refers to reads from / writes to "the filesystem", the only use of this rather ambiguous term, which technically could be referring to the git object database. (All other mentions are part of phrases such as "..filesystems (like NFS).."). Other sections, including the section on core.safecrlf, use the term "work tree" for the same purpose as the term "the filesystem" is used in the core.autocrlf section, so that seems like a good alternative, which makes it clearer what direction the addition/removal of CR characters occurs in. Signed-off-by: Will Palmer <wmpalmer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f78683f
advice.h
#ifndef ADVICE_H
#define ADVICE_H
#include "git-compat-util.h"
extern int advice_push_nonfastforward;
extern int advice_status_hints;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;
int git_default_advice_config(const char *var, const char *value);
extern void NORETURN die_resolve_conflict(const char *me);
#endif /* ADVICE_H */
Computing file changes ...
