Skip to content

Commit a1184d8

Browse files
gitstergitster
committed
Merge branch 'mv/merge-custom'
* mv/merge-custom: t7606: fix custom merge test Fix "git-merge -s bogo" help text Update .gitignore to ignore git-help Builtin git-help. builtin-help: always load_command_list() in cmd_help() Add a second testcase for handling invalid strategies in git-merge Add a new test for using a custom merge strategy builtin-merge: allow using a custom strategy builtin-help: make some internal functions available to other builtins Conflicts: help.c
2 parents 8d13caf + e596cdd commit a1184d8

File tree

8 files changed

+627
-508
lines changed

8 files changed

+627
-508
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ git-gc
5151
git-get-tar-commit-id
5252
git-grep
5353
git-hash-object
54+
git-help
5455
git-http-fetch
5556
git-http-push
5657
git-imap-send

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ LIB_H += git-compat-util.h
357357
LIB_H += graph.h
358358
LIB_H += grep.h
359359
LIB_H += hash.h
360+
LIB_H += help.h
360361
LIB_H += list-objects.h
361362
LIB_H += ll-merge.h
362363
LIB_H += log-tree.h
@@ -520,6 +521,7 @@ BUILTIN_OBJS += builtin-for-each-ref.o
520521
BUILTIN_OBJS += builtin-fsck.o
521522
BUILTIN_OBJS += builtin-gc.o
522523
BUILTIN_OBJS += builtin-grep.o
524+
BUILTIN_OBJS += builtin-help.o
523525
BUILTIN_OBJS += builtin-init-db.o
524526
BUILTIN_OBJS += builtin-log.o
525527
BUILTIN_OBJS += builtin-ls-files.o
@@ -1103,7 +1105,7 @@ git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
11031105
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
11041106
$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
11051107

1106-
help.o: help.c common-cmds.h GIT-CFLAGS
1108+
builtin-help.o: builtin-help.c common-cmds.h GIT-CFLAGS
11071109
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
11081110
'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
11091111
'-DGIT_MAN_PATH="$(mandir_SQ)"' \

0 commit comments

Comments
 (0)