This is disappointing, and I just can't find the right answer on how to handle this. I am after rebase [but this is only one of many scenarios where this problem arises], and I have a ton of files “modified but not updated” that do not make any difference, but for newlines.
git diff -b
nothing returns.
Now I just want to delete the changes and leave the files as they are in the repo. I have found many "solutions":
1 Saving changes
a) with -keep-index [this was from SO]
$ git stash save
Saved working directory and index state WIP on COM-23: 4a8abc1 COM-23 changed pa
ckage name
HEAD is now at 4a8abc1 COM-23 changed package name
$ git stash drop
Dropped refs/stash@{0} (7d822e3c6bdc310f4a4be90ed937dd0ea97df627)
$ git status
[tons of files marked as changed but not updated]
b) without -keep-index
just like with 'a'
2 git reset
a) just a reset
git reset
as stated above
b) with the addition
git add -A
git reset --hard HEAD
as stated above
3 checkout
git checkout
, , .
, - , , , !
?
,
Krystian