Skip to content
/ rstash Public

r[emote]stash: cli tool to stash your local changes in a temporary remote branch

License

Notifications You must be signed in to change notification settings

otto-de/rstash

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

28 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

rstash

r[emote]stash is a bash script that was created to make remote pair programming easier.

Pair programming usually follows the Driver-Navigator approach. This means that both developers have the same view in front of them, but only one of them controls the mouse and the keyboard, whereas the other one says what should be done. After a previously defined duration, the roles are swapped. This works without any problems if both are sitting in front of the same computer. In times of home office this is not always the case. The local changes must therefore be transferred from one computer to the other when swapping the roles. You can do this by sending patches to each other or by working on a branch. We work with branches very rarely, so this script was created to simplify and speed up the workflow.

Installation

  • Goto Releases
  • Download the latest rstash script
  • Move the script to a directory in your PATH
  • Alternatively: Install via asdf

Usage

Alice:

  • Open any git repository
  • Make some changes
  • Execute rstash without any arguments
  • rstash creates a new branch with a unique name
  • Press [Enter] to discard the changes locally

Bob:

  • Open the same git repository
  • Execute rstash 123, whereas 123 is the rstash pin which was displayed in Alice's command line after executing rstash
  • Or execute rstash list to get a list with all rstash branches to find the right pin
  • Or executes rstash pop to try and pop the branch automatically. If only one rstash branch is found, it is popped. If more than a single branch is found, then Bob can filter through the available options using a fuzzy finder. Note that, in this case, the most recently created branch will be the first option, so he only needs to hit enter.
  • rstash pulls the changes in your modification stage
  • Press [Enter] to remove the temporary rstash branch

Contribute

rstash is currently in active development and welcomes code improvements, bug fixes, suggestions and feature requests.

Please document all notable changes to this project in the provided changelog. Note that this project adheres to Semantic Versioning.

License

Distributed under Apache License 2.0

Known issues

Issues:Bug

About

r[emote]stash: cli tool to stash your local changes in a temporary remote branch

Resources

License

Stars

Watchers

Forks

Contributors 4

  •  
  •  
  •  
  •  

Languages