'git add' Part of a File

It's the kind of thing you would assume is too good to be true. It's a more advanced feature and so most people don't get taught it when introduced to 'git'.

git add [-p | --patch]

 I remember it as -p for partial, but never mind.

 It brings up a small interface that displays one hunk of code at a time. The question mark command will explain how to use it. However it's not obvious that 'e' for 'edit' allows you to edit which changes are made rather than edit the changes themselves.

 It opens up what looks like a 'git diff', where you remove changes you don't want to 'git add' by removing '+' lines or removing the '-' in front of lines to be taken away. i.e. choosing which '+' to add and which '-' to add.

 Anyway if you're adding part of a file, if you have access to a GUI, it's going to be easier to do it that way.

Comments

Post a Comment

Popular posts from this blog

Fix Controller Input when a Game Doesn't Use Steam Input

Background Knowledge Steam Input is an interface for developers to use the controller configuration built into Steam for their games. It is entirely optional and not all games use it. Steam gives you the option to enable and disable Steam Input on a per game basis. Steam has controller button mapping for in-game, Big Picture Mode, and on desktop (outside of games), and mappings for individual games. By default Steam will give certain controllers a desktop mapping that lets you move the mouse and bring up an on-screen keyboard, which is not what you want in a game. If you press F11 in a game and Steam Overlay doesn't appear and you have it configured to appear, Steam thinks that you are not in a game, and therefore it will use the desktop mapping instead of the in-game mapping. Steam Input works by capturing inputs from your controller, suppressing them from the rest of your system and emitting the inputs that you desire instead to the rest of your system. Problem If you are playin...
Read more

VSC Vanishing Go Imports

With the Go extension installed in VSC, by default if you have an unused import, when you save, it will disappear. If you're like me and you may habitually press ctrl+s, this is very frustrating. After a lot of messing around in VSC's settings. I learned that this "feature" has nothing to do with the settings pertaining to linting or formatting. It's actually to do with automatic import organisation, which you can configure as follows in VSC's settings.json. "[go]" : { "editor.codeActionsOnSave" : { "source.organizeImports" : false, }, } This solution comes from this StackOverflow answer. You can still organise imports with the shortcut shift+alt+o.
Read more

En Dash with ComposeKey (Shift+AltGr)

AltGr is short for "alternative grammar". It doesn't do much on Windows, outside of adding acute accents to vowels and turning '4' into '€'. On Linux it does a much wider variety of things and more things still with 'AltGr+Shift', just give it a try. It's not just for foreign characters but also fractions and arrows. There is also a program called ComposeKey , which Ubuntu and probably many other distros, comes with automatically. If you type 'Shift+AltGr' the next few characters you type will be composed into  a character that sort of resembles that combination e.g. Shift+AltGr, s, s => ß  and Shift+AltGr, =, > => ⇒ . You can alter the config for combinations here:   /usr/share/X11/locale/en_US.UTF-8/Compose  (or similar). Although 3 hyphens does make an 'em dash', 2 hyphens doesn't make an 'en dash'. What I didn't realise until I looked in the config file was that you need 2 hyphens followed by...
Read more