[DiscordArchive] What should we do about that?
[DiscordArchive] What should we do about that?
Original source
What should we do about that?
rektbyfaith
06-18-2019, 08:11 AM #1Archived author: Skarn • Posted: 2019-06-18T08:11:18.816000+00:00
Original source
What should we do about that?
Original source
mfw he gave up merging
rektbyfaith
06-18-2019, 08:11 AM #2Archived author: Adspartan • Posted: 2019-06-18T08:11:19.340000+00:00
Original source
mfw he gave up merging
Original source
rektbyfaith
06-18-2019, 08:11 AM #3Archived author: Skarn • Posted: 2019-06-18T08:11:24.789000+00:00
Original source
Original source
well, understandable
rektbyfaith
06-18-2019, 08:11 AM #4Archived author: Skarn • Posted: 2019-06-18T08:11:49.352000+00:00
Original source
well, understandable
Original source
`#include <QtWidgets\QTreeWidget>` wew
rektbyfaith
06-18-2019, 08:15 AM #5Archived author: schlumpf • Posted: 2019-06-18T08:15:33.397000+00:00
Original source
`#include <QtWidgets\QTreeWidget>` wew
Original source
it's a lot better "ignoring whitespace" but iirc the changes are still commited
rektbyfaith
06-18-2019, 08:15 AM #6Archived author: Adspartan • Posted: 2019-06-18T08:15:51.386000+00:00
Original source
it's a lot better "ignoring whitespace" but iirc the changes are still commited
Original source
Well, other than the reset-diff-apply trick I have no idea but using the -w diff and manually applying that mess, preferably in multiple commits
rektbyfaith
06-18-2019, 08:16 AM #7Archived author: schlumpf • Posted: 2019-06-18T08:16:13.324000+00:00
Original source
Well, other than the reset-diff-apply trick I have no idea but using the -w diff and manually applying that mess, preferably in multiple commits
Original source
how do I do that?
rektbyfaith
06-18-2019, 08:16 AM #8Archived author: Skarn • Posted: 2019-06-18T08:16:13.446000+00:00
Original source
how do I do that?
Original source
I do not know with hg, but for git I use
```
git reset --soft HEAD^ # chop off last commit but keep changes
git diff -U0 -w --no-color | git apply --cached --ignore-whitespace --unidiff-zero - # diff without whitespace changes and stage that
git commit -m "mess, but without whitespace"
```
rektbyfaith
06-18-2019, 08:17 AM #9Archived author: schlumpf • Posted: 2019-06-18T08:17:47.627000+00:00
Original source
I do not know with hg, but for git I use
```
git reset --soft HEAD^ # chop off last commit but keep changes
git diff -U0 -w --no-color | git apply --cached --ignore-whitespace --unidiff-zero - # diff without whitespace changes and stage that
git commit -m "mess, but without whitespace"
```
Original source
hg surely has similar commands. maybe instead of diff | apply you need to diff > file and apply < file or something, but the general process is the same.
rektbyfaith
06-18-2019, 08:18 AM #10Archived author: schlumpf • Posted: 2019-06-18T08:18:37.269000+00:00
Original source
hg surely has similar commands. maybe instead of diff | apply you need to diff > file and apply < file or something, but the general process is the same.
1 Guest(s)
1 Guest(s)