path: root/advice.c
diff options
authorJunio C Hamano <>2010-01-30 06:03:24 (GMT)
committerJunio C Hamano <>2010-01-30 06:11:00 (GMT)
commit13be3e31f1775bd496fc5bc1ab5b745052f4d07d (patch)
tree0bce4afc79894645a86c8d8a219b461d57760eb3 /advice.c
parentb2c2e4c22c6a4fe151f02380d247cf3d9a9d5d1e (diff)
Reword "detached HEAD" notification
The old "advice" message explained how to create a branch after going into a detached HEAD state but didn't make it clear why the user may want to do so. Also "moving to ... which isn't a local branch" was unclear if it is complaining, if it is describing the new state, or if it is explaining why the HEAD is detached (the true reason is the last one). Give the established phrase 'detached HEAD' first to make it easy for users to look up the concept in documentation, and briefly describe what can be done in the state (i.e. play around without having to clean up) before telling the user how to keep what was done during the temporary state. Allow the long description to be hidden by setting advice.detachedHead configuration to false. We might want to customize the advice depending on how the commit to check out was spelled (e.g. instead of "new-branch-name", we way want to say "topic" when "git checkout origin/topic" triggered this message) in later updates, but this encapsulates that into a separate function and it should be a good first step. Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'advice.c')
1 files changed, 2 insertions, 0 deletions
diff --git a/advice.c b/advice.c
index 936d98b..0be4b5f 100644
--- a/advice.c
+++ b/advice.c
@@ -5,6 +5,7 @@ int advice_status_hints = 1;
int advice_commit_before_merge = 1;
int advice_resolve_conflict = 1;
int advice_implicit_identity = 1;
+int advice_detached_head = 1;
static struct {
const char *name;
@@ -15,6 +16,7 @@ static struct {
{ "commitbeforemerge", &advice_commit_before_merge },
{ "resolveconflict", &advice_resolve_conflict },
{ "implicitidentity", &advice_implicit_identity },
+ { "detachedhead", &advice_detached_head },
int git_default_advice_config(const char *var, const char *value)