diff options
| author | René Scharfe <l.s.r@web.de> | 2016-09-13 19:37:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-13 16:26:12 -0700 |
| commit | b56aa5b268ee2188c3dee27cc94025f4c647594a (patch) | |
| tree | ac00a5ed14c59ea8ef64bb5fe58a3c59ed17a7b9 /Documentation/git-merge-file.txt | |
| parent | 91942260a2a8c8659450159dda73702f5cbda528 (diff) | |
| download | git-b56aa5b268ee2188c3dee27cc94025f4c647594a.tar.gz git-b56aa5b268ee2188c3dee27cc94025f4c647594a.tar.xz | |
unpack-trees: pass checkout state explicitly to check_updates()
Add a parameter for the struct checkout variable to check_updates()
instead of using a static global variable. Passing it explicitly makes
object ownership and usage more easily apparent. And we get rid of a
static variable; those can be problematic in library-like code.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions