diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-16 04:11:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-16 04:11:53 +0300 |
| commit | 06bca9708ac86d286a6f5265ff0e6c532f44c657 (patch) | |
| tree | b334bef2db6fa40422d14aadbbac3f1a4e18acfa /Documentation | |
| parent | c5f7b2a6fe34bbdd4453be6620e08dbcf1b695fb (diff) | |
| parent | 5a7d41d849290ceadb02487ec962c5a040391535 (diff) | |
Merge branch 'ab/retire-scripted-add-p'
Finally retire the scripted "git add -p/-i" implementation and have
everybody use the one reimplemented in C.
* ab/retire-scripted-add-p:
docs & comments: replace mentions of "git-add--interactive.perl"
add API: remove run_add_interactive() wrapper function
add: remove "add.interactive.useBuiltin" & Perl "git add--interactive"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/add.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-add.txt | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/config/add.txt b/Documentation/config/add.txt index 3e859f3419..e0354ceaed 100644 --- a/Documentation/config/add.txt +++ b/Documentation/config/add.txt @@ -7,6 +7,7 @@ add.ignore-errors (deprecated):: variables. add.interactive.useBuiltin:: - Set to `false` to fall back to the original Perl implementation of - the interactive version of linkgit:git-add[1] instead of the built-in - version. Is `true` by default. + Unused configuration variable. Used in Git versions v2.25.0 to + v2.36.0 to enable the built-in version of linkgit:git-add[1]'s + interactive mode, which then became the default in Git + versions v2.37.0 to v2.39.0. diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index a030d33c6e..ed44c1cb31 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -274,7 +274,7 @@ status:: ------------ staged unstaged path 1: binary nothing foo.png - 2: +403/-35 +1/-1 git-add--interactive.perl + 2: +403/-35 +1/-1 add-interactive.c ------------ + It shows that foo.png has differences from HEAD (but that is @@ -282,7 +282,7 @@ binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The -other file, git-add{litdd}interactive.perl, has 403 lines added +other file, add-interactive.c, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion). @@ -303,7 +303,7 @@ like this: ------------ staged unstaged path 1: binary nothing foo.png -* 2: +403/-35 +1/-1 git-add--interactive.perl +* 2: +403/-35 +1/-1 add-interactive.c ------------ + To remove selection, prefix the input with `-` |