Change files in working directory while not changing branch

Question

In order to create a clean commit history and get rid of some files I don't want for a PR, I would like to set my working directory to be at the state of my branch, say B, but make git remain on branch A which is identical with main, so I can now stage whatever I want to be part of the commit.

In other words: I want to be on main, but have the working directory be like the working directory of another branch A.

I know I can git rebase and edit, but that involves a lot of steps. I simply want to change the files in the working directory and nothing else.

I've found a hacky way but is there something simpler than:

git branch -c A B
git reset --soft main
git restore --staged .

I'm pretty sure both your question and your answer have some typos in it. (What is git branch -b and git create -b ?) And, it sounds like you'd benefit from reading this question, and in particular, this answer where Regret Type 2 is exactly what you're asking. — TTT
– TTT, Commented Jul 14, 2023 at 20:28
Woops, yes, I must have meant git branch -c all the time. Thanks for the amazing answer with regret types: stackoverflow.com/a/59675191/7483211 — Cornelius Roemer
– Cornelius Roemer, Commented Jul 15, 2023 at 1:15

Cornelius Roemer · Accepted Answer · 2023-07-15 01:12:07Z

0

Using git checkout COMMIT . instead of git reseset appears to be slightly more intuitive to me:

git branch -c A main
git checkout B .
git restore --staged .

(from https://stackoverflow.com/a/49572040/7483211)

But using git reset --mixed is actually the most succinct I think:

git branch -c A B
git reset --mixed main

as --soft puts changes in staging, while --mixed makes changes unstaged.

edited Jul 15, 2023 at 1:12

answered Jul 14, 2023 at 12:45

Cornelius Roemer

10.4k6 gold badges62 silver badges122 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

Change files in working directory while not changing branch

1 Answer 1

Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related