Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[fix] typo in githelper script

Browse Source 
close #710
This commit is contained in:
Gautier Hattenberger
2014-05-09 12:11:07 +02:00
parent 8bbe5268a0
commit 1dd6dc5e6b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
githelper.sh
+1 -1
View File
@@ -83,7 +83,7 @@ case "$choice" in
echo -e "-use the master code again?: \033[1mgit checkout master\033[0m (check how fast git does this!)"
echo -e "-continue the work on the branch again?: \033[1mgit checkout $branch\033[0m"
echo -e "-I want to see the list of changes compared to my master: \033[1mgit diff master $branch\033[0m (use 'q' to exit)"
echo -e "-Ok, this code is good. I want it in my master now: \033[1mgit checkout master; git merge $branch; $git branch -d $branch\033[0m"
echo -e "-Ok, this code is good. I want it in my master now: \033[1mgit checkout master; git merge $branch; git branch -d $branch\033[0m"
exit;
;;
4 )