diff options
| author |  Lars Hjemli <hjemli@gmail.com> | 2006-10-23 23:27:45 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-10-23 20:43:49 -0700 |
| commit | c31820c26b8f164433e67d28c403ca0df0316055 (patch) | |
| tree | f0aa310fedf7e70c2cc8431cbdc7462771a8611d /Makefile | |
| parent | ref-log: fix D/F conflict coming from deleted refs. (diff) | |
| download | tgif-c31820c26b8f164433e67d28c403ca0df0316055.tar.xz | |
Make git-branch a builtin
This replaces git-branch.sh with builtin-branch.c
The changes is basically a patch from Kristian Høgsberg, updated
to apply onto current 'next'
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -156,7 +156,7 @@ BASIC_CFLAGS = BASIC_LDFLAGS = SCRIPT_SH = \ - git-bisect.sh git-branch.sh git-checkout.sh \ + git-bisect.sh git-checkout.sh \ git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \ git-fetch.sh \ git-ls-remote.sh \ @@ -267,6 +267,7 @@ BUILTIN_OBJS = \ builtin-add.o \ builtin-apply.o \ builtin-archive.o \ + builtin-branch.o \ builtin-cat-file.o \ builtin-checkout-index.o \ builtin-check-ref-format.o \ |