On Sat, Aug 24, 2019 at 1:43 AM David Aguilar <davvid@xxxxxxxxx> wrote: > > On Fri, Aug 23, 2019 at 03:31:03AM +0530, Pratyush Yadav wrote: > > Hi, > > > > This series adds the ability to revert selected lines and hunks in > > git-gui. Partially based on the patch by Bert Wesarg [0]. > > > > The commits can be found in the topic branch 'py/revert-hunks-lines' > > at https://github.com/prati0100/git-gui/tree/py/revert-hunks-lines > > > > Once reviewed, pull the commits from > > 415ce3f8582769d1d454b3796dc6c9c847cefa87 till > > 0a1f4ea92b97e673fda40918dae68deead43bb27, or just munge the patches and > > apply them locally, whichever you prefer. > > > > Changes in v2: > > - Add an option to disable the revert confirmation prompt as suggested > > by Johannes Sixt. > > - Base the patches on Pat's git-gui tree instead of git.git. > > > We've had these features for years in git-cola. this series does not introduce new hotkeys. > > Please copy our keyboard shortcuts. > IMO we should not re-invent the user interactions. > > http://git-cola.github.io/share/doc/git-cola/hotkeys.html my part for the homework: > > Ctrl-u is our revert-unstaged-edits hotkeys. https://github.com/patthoyts/git-gui/commit/b677c66e299c8754a6093cbd19ce71b0ad2a8a17 > "s" is for > staging/unstaging (or Ctrl-s if the file list is focused). https://github.com/patthoyts/git-gui/commit/cd16a6c9298778265a044e5f9a39b006277b32f2 https://github.com/patthoyts/git-gui/commit/e210e67451f22f97c1476d6b78b6fa7fdd5817f9#diff-ceba4b88c7e634c5401a4487d45d3ab4R774 Bert > > The same hotkey is used for operating at the line level. > If no lines are selected, the hunk surrounding the current cursor > position is used. > > Please make keyboard interaction a first-class design consideration. >
