git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Stage, test, and commit only some changes, then repeat

From
Géry Ogam <gery.ogam@gmail.com>
Date
Jan 30, 2022, 20:17 UTC
Message-ID
<37128901-233F-4428-8A52-470773A18AB0@gmail.com>
Hello,
I would like to stage, test, and commit only *some* changes of the working tree, and then repeat this process with the remaining changes.
My current solution (published at https://stackoverflow.com/a/70914962/2326961):
1. Stage some changes:
   ```
   git add -p file
   ```
2. Save away the remaining changes:
   ```
   git diff >patch
   git stash push -k
   ```
3. Test the staged changes.
4. Commit the staged changes:
   ```
   git commit
   ```
5. Restore the remaining changes:
   ```
   git apply patch
   ```
6. Go to step 1.
It is not ideal because a) it uses a patch file for saving the remaining changes; b) it uses the stash only for setting the working tree to the index state.
It would be ideal if I could save *only* the remaining changes in the stash instead of resorting to a patch file. How to do it?
Best,
Géry Ogam

[Info système] version git :: git version 2.35.1 cpu: x86_64 no commit associated with this build sizeof-long: 8 sizeof-size_t: 8 shell-path: /bin/sh uname: Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64 x86_64 info compilateur : clang: 13.0.0 (clang-1300.0.29.3) info libc : aucune information de libc disponible $SHELL (typically, interactive shell): /bin/zsh

[Crochets activés]
Next: Johannes Sixt
Message 1 of 8 in “Stage, test, and commit only some changes, then repeat”
  1. Géry OgamJan 30, 2022
  2. Johannes SixtJan 30, 2022
  3. Géry OgamJan 31, 2022
  4. Sergey OrganovJan 31, 2022
  5. Géry OgamJan 31, 2022
  6. Sergey OrganovJan 31, 2022
  7. Géry OgamJan 31, 2022
  8. Sergey OrganovFeb 1, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.