[PATCH 4/4] Make git-pull give hints on what to do when there is no branch to merge from
From: Federico Mena Quintero <hidden>
Date: 2016-06-15 22:43:35
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Federico Mena Quintero <redacted> --- git-pull.sh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 5e96d1f..7beef4d 100755
--- a/git-pull.sh
+++ b/git-pull.sh@@ -98,7 +98,11 @@ case "$merge_head" in curr_branch=${curr_branch#refs/heads/} echo >&2 "Warning: No merge candidate found because value of config option - \"branch.${curr_branch}.merge\" does not match any remote branch fetched." + \"branch.${curr_branch}.merge\" does not match any remote branch fetched. + This branch is not set up to track any other branches. Please name which + branch you want to merge from on the command line, or if you almost always + want to merge from the same branch, then set this up with + \"git branch --track\"." echo >&2 "No changes." exit 0 ;;
--
1.5.2.4