diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-03-29 17:39:07 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-02 13:56:59 +0900 |
| commit | 3ec37ad13dea55f6a614753accc7fad84cb170be (patch) | |
| tree | bf3fb6056dc4d0e9e2513de09f5518970a94ec28 /t/t4013/diff.format-patch_--inline_--stdout_initial..side | |
| parent | switch: better names for -b and -B (diff) | |
| download | git-3ec37ad13dea55f6a614753accc7fad84cb170be.tar.gz git-3ec37ad13dea55f6a614753accc7fad84cb170be.zip | |
switch: add --discard-changes
--discard-changes is a better name than --force for this option since
it's what really happens. --force is turned to an alias for
--discard-changes. But it's meant to be an alias for potentially more
force options in the future.
Side note. It's not obvious from the patch but --discard-changes also
affects submodules if --recurse-submodules is used. The knob to force
updating submodules is hidden behind unpack-trees.c
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..side')
0 files changed, 0 insertions, 0 deletions