| commit | 55cf704a9d139bca0cb5cca1bf047eb043e13bd2 | |
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | |
| Fri, 29 Mar 2019 10:39:03 +0000 (29 17:39 +0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Apr 2019 04:56:59 +0000 (2 13:56 +0900) | ||
| tree | 8fafc9848dfb2f2009e14cdf1717daf49b3e9d10 | treesnapshot (tar.gz zip) |
| parent | b3edccb967ab4531e6a5fd20610a3be93be01c70 | commitdiff |
checkout: move 'confict_style' and 'dwim_..' to checkout_opts
These local variables are referenced by struct option[]. This struct
will soon be broken down, moved away and we can't rely on local
variables anymore. Move these two to struct checkout_opts in
preparation for that.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
These local variables are referenced by struct option[]. This struct
will soon be broken down, moved away and we can't rely on local
variables anymore. Move these two to struct checkout_opts in
preparation for that.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/checkout.c | diffblobblamehistory |