summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 516d15f)
raw | patch | inline | side by side (parent: 516d15f)
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Mon, 13 Sep 2010 19:03:26 +0000 (19:03 +0000) | ||
committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sat, 30 Oct 2010 07:58:21 +0000 (07:58 +0000) |
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
git-pull.sh | patch | blob | history |
diff --git a/git-pull.sh b/git-pull.sh
index 4c08623b9ad04e02ebc17ca429c655bcb2d48eb0..380137b0aa8a6eef2d584ad2a8a08ce198765679 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line."; echo
elif [ -z "$curr_branch" ]; then
- echo "You are not currently on a branch, so I cannot use any"
- echo "'branch.<branchname>.merge' in your configuration file."
- echo "Please specify which remote branch you want to use on the command"
- echo "line and try again (e.g. 'git pull <repository> <refspec>')."
- echo "See git-pull(1) for details."
+ gettext "You are not currently on a branch, so I cannot use any
+'branch.<branchname>.merge' in your configuration file.
+Please specify which remote branch you want to use on the command
+line and try again (e.g. 'git pull <repository> <refspec>').
+See git-pull(1) for details."; echo
elif [ -z "$upstream" ]; then
echo "You asked me to pull without telling me which branch you"
echo "want to $op_type $op_prep, and 'branch.${curr_branch}.merge' in"