diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-18 00:42:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-18 00:42:01 -0700 |
| commit | 9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e (patch) | |
| tree | d49794a304c2b949d9a49e56b7e5028cce44e406 /Makefile | |
| parent | 148c63006a8e4985a9eee0863073588d8ac18a8a (diff) | |
| parent | 58f6fb53dd1104559f6f5507562a975c0ff079af (diff) | |
| download | git-9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e.tar.gz git-9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e.tar.xz | |
Merge branch 'cr/reset'
* cr/reset:
Simplify cache API
An additional test for "git-reset -- path"
Make "git reset" a builtin.
Move make_cache_entry() from merge-recursive.c into read-cache.c
Add tests for documented features of "git reset".
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -211,7 +211,7 @@ SCRIPT_SH = \ git-ls-remote.sh \ git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \ git-pull.sh git-rebase.sh git-rebase--interactive.sh \ - git-repack.sh git-request-pull.sh git-reset.sh \ + git-repack.sh git-request-pull.sh \ git-sh-setup.sh \ git-am.sh \ git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \ @@ -358,6 +358,7 @@ BUILTIN_OBJS = \ builtin-reflog.o \ builtin-config.o \ builtin-rerere.o \ + builtin-reset.o \ builtin-rev-list.o \ builtin-rev-parse.o \ builtin-revert.o \ |