10

This is kind of a hard question to explain, mainly because I still don't know a whole bunch about git.

I just know the basics to be able to get by.

Currently I've been working on a bigger project and have changed a bunch of lines in a specific file. The update that I'm working on is still a ways away from being committed and pushed to git.

Lone behold there ended up being a smaller update that I had to make within that same file and now need to push that code instead of the semi working file currently.

Is there any way that I could stash certain lines of that file so that the bigger changes I made to that file don't get lost when I decide to push the smaller changes?

Or do I have to stash what I currently have now, and then go back into the file and remake the smaller changes again and push that?

Sorry if this is hard to understand, it's kind of difficult to explain, plus I don't know if there is a way of currently doing this with git anyways.

EDIT

I'm looking into using separate branches just like the second answer suggests. This seems like a more efficient solution, and will allow me to keep track of my fixes.

Michael
  • 1,454
  • 3
  • 19
  • 45
  • 2
    Rather than _stashing_ specific lines, I would recommend adding/committing specific lines using `git add --interactive` or `git add --patch`: https://stackoverflow.com/questions/1085162/commit-only-part-of-a-file-in-git – Alexander Nied Oct 04 '19 at 19:33
  • 1
    To add to Alexander's comment; if you really want to use `stash` you can use `git add -p` to exlude whatever you want and then `git stash --keep-index`. – Calum Halpin Oct 04 '19 at 19:38
  • Ok I will look into these solutions a little more. – Michael Oct 04 '19 at 20:40

2 Answers2

15

You can stash specific lines from files by using the --patch option:

git stash --patch

git stash --patch  <filename>

Git will ask you interactively what you want to do with each file. You can edit the files or choose which lines get stashed

Note that you can also do this when adding files to your staging area with git add:

git add --patch  <filenames>

If what you want to do is commit part of a file, you can stage the part you want to commit with git add --patch, and there is no need to stash.

David Sugar
  • 1,042
  • 6
  • 8
2

Read about git branches, which allow you to work on fixes to multiple aspects of a project separately.

You should create one branch for the big ongoing changes, and a separate branch for the smaller update.

Example with more details: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

Burrito
  • 1,475
  • 19
  • 27
  • Although this is not exactly what I was asking for, I think that this is probably the best way to keep track of ongoing code without running into conflicts. I started to use this in my everyday process, and it has helped a bunch, therefore I gave you a bump. – Michael Aug 25 '20 at 15:20