Rename a local and remote branch in git

Multiple States Knowledge Base

If you have named a branch incorrectly AND pushed this to the remote repository follow these steps before any other developers get a chance to jump on you and give you shit for not correctly following naming conventions.

1. Rename your local branch.
If you are on the branch you want to rename:

If you are on a different branch:

2. Delete the old-name remote branch and push the new-name local branch.

3. Reset the upstream branch for the new-name local branch.
Switch to the branch and then:

View original post

Courage

There will be always events, people and factors to discourage you. Finding something interesting and encouraging, is what it takes, to keep you going.

Causes

Nothing is ever consistent in this world. But changes are not obvious, they have causes. We must seek and control causes to control inconsistency.

Fish Curry (Machha Jhola)

Servings: 2

Ingredients:

  • Oil – 3 to 4 tbsp
  • Cumin Powder – 2 tbsp
  • Green Chilly (chopped) – 1
  • Onion (finely chopped) – 1 medium sized
  • Ginger Garlic Paste – 3 tbsp
  • Chilli Powder – 1 tsp
  • Turmeric Powder – 3/4 tsp
  • Salt – to taste
  • Coriander Powder 1 tsp
  • Garam Masala / Curry Masala – 1 tbsp
  • Tomato (finely chopped) – 1 medium sized
  • Fried fish – 4 medium sized pieces
  • Coriander leaves (finely chopped) – 2 tbsp

Process:

  1.  Heat oil in a wok / deep pan.
  2. Add cumin powder and green chilly to it. Let the chilies crackle for some time.
  3. Add chopped onions to it. When they are turn brown add ginger-garlic paste to it. Stir for a minute or two.
  4. Add chilly powder, turmeric powder, salt, coriander powder and garam masala/ curry masala. Stir it till the spices are cooked.
  5. Add chopped tomato to it. Let it cook.
  6. Add fried fish to it. Let it soak spices for a minute or two. Then add water to it. Allow it to boil on simmer for 10 minutes or so.
  7. Add chopped coriander leaves on top.
  8. Serve hot.