                         git branch -d <branchname>
                         """
 
-        push_the_branch_to_your_remote_repository_so_others_can_use_it :
+        push_branch :
                 insert:
                         """
                         git push origin <branchname>
                         """
 
-        push_all_branches_to_your_remote_repository :
+        push_all_branches :
                 insert:
                         """
                         git push --all origin
                         """
 
-        delete_a_branch_on_your_remote_repository :
+        delete_remote_branch :
                 insert:
                         """
-                        git push origin :<branchname>
-                        """
-
-        update_from_the_remote_repository_fetch_and_merge_changes_on_the_remote_server_to_your_working_directory :
+                        git push origin --delete <branchName>
+                        """
+
+        pull :
                 insert:
                         """
                         git pull
                         """
 
-        to_merge_a_different_branch_into_your_active_branch :
+        merge_branch :
                 insert:
                         """
                         git merge <branchname>
-                        """
-
-        view_all_the_merge_conflicts :
+                        git diff
+                        git diff --base <filename>
+                        git diff <sourcebranch> <targetbranch>
+                        git add <filename>
+                        """
+
+        show_history :
                 insert:
                         """
-                        git diff
-                        """
-
-        git_diff_base_filename :
-                insert:
-                        """
-                        git diff --base <filename>
-                        """
-
-        git_diff_sourcebranch_targetbranch :
-                insert:
-                        """
-                        git diff <sourcebranch> <targetbranch>
-                        """
-
-        after_you_have_manually_resolved_any_conflicts_you_mark_the_changed_file :
-                insert:
-                        """
-                        git add <filename>
-                        git tag 1.0.0 <commitID>
                         git log
-                        """
-
-        push_all_tags_to_remote_repository :
-                insert:
-                        """
-                        git push --tags origin
                         """
 
         undo_local_changes :

                        git reset --hard origin/master
                        """

        search_search_the_working_directory_for :
                insert:
                        """
                        git grep "foo()"

        create_gitignore :
                insert:
                        """
                        # See examples of .gitignore files at https://github.com/github/gitignore
                        echo "
                        # For SMC files like .sagews .sage-chat etc
                        *.sagews
                        *.sage-chat
                        *.sage-history
                        *.term

                        *.py[cod]" >> .gitignore
                        """
        clone_local_repo :
                insert: 
                        """
                        git clone ~/local_dir/
                        """     
        clone_remote_repo :
                insert: 
