git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b3edccb)
checkout: move 'confict_style' and 'dwim_..' to checkout_opts
authorNguyễn Thái Ngọc Duy <redacted>
Fri, 29 Mar 2019 10:39:03 +0000 (17:39 +0700)
committerJunio C Hamano <redacted>
Tue, 2 Apr 2019 04:56:59 +0000 (13:56 +0900)
commit55cf704a9d139bca0cb5cca1bf047eb043e13bd2
tree8fafc9848dfb2f2009e14cdf1717daf49b3e9d10tree | snapshot
parentb3edccb967ab4531e6a5fd20610a3be93be01c70commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/checkout.c diff | blob | history
git clone https://git.99rst.org/PROJECT