Skip to content

Commit 6937bb0

Browse files
committed
Merge remote-tracking branch 'dscho/add-p' into add-p-g4w
Let's test this for a while. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents f00783b + 2e4901a commit 6937bb0

23 files changed

+3435
-78
lines changed

Documentation/config/add.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ add.ignore-errors (deprecated)::
55
option of linkgit:git-add[1]. `add.ignore-errors` is deprecated,
66
as it does not follow the usual naming convention for configuration
77
variables.
8+
9+
add.interactive.useBuiltin::
10+
[EXPERIMENTAL] Set to `true` to use the experimental built-in
11+
implementation of the interactive version of linkgit:git-add[1]
12+
instead of the Perl script version. Is `false` by default.

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,8 @@ LIB_H := $(sort $(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null
826826
-name '*.h' -print))
827827

828828
LIB_OBJS += abspath.o
829+
LIB_OBJS += add-interactive.o
830+
LIB_OBJS += add-patch.o
829831
LIB_OBJS += advice.o
830832
LIB_OBJS += alias.o
831833
LIB_OBJS += alloc.o

0 commit comments

Comments
 (0)