diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-28 18:45:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-28 18:45:22 +0200 |
| commit | ddcb8fd8b94c066406c2a4f41e04122cb2a742ad (patch) | |
| tree | ae13c7c5f6efeb4d21a25d97e4109df4a8816589 /environment.h | |
| parent | Merge branch 'rs/describe-parseopt-fix' (diff) | |
| parent | pack-objects: fix --no-quiet (diff) | |
| download | git-ddcb8fd8b94c066406c2a4f41e04122cb2a742ad.tar.xz git-ddcb8fd8b94c066406c2a4f41e04122cb2a742ad.zip | |
Merge branch 'rs/pack-objects-parseopt-fix'
Command line parser fix.
* rs/pack-objects-parseopt-fix:
pack-objects: fix --no-quiet
pack-objects: fix --no-keep-true-parents
Diffstat (limited to 'environment.h')
| -rw-r--r-- | environment.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.h b/environment.h index 611aa0ffed..c5377473c6 100644 --- a/environment.h +++ b/environment.h @@ -193,7 +193,7 @@ extern enum object_creation_mode object_creation_mode; extern char *notes_ref_name; -extern int grafts_replace_parents; +extern int grafts_keep_true_parents; extern int repository_format_precious_objects; |