summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2020-04-07 14:28:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-10 16:28:02 (GMT)
commitb309a9710899dab2f76455526f573a90fad5d13c (patch)
tree3480c1f5210dc8612234238315612002433039d6 /Makefile
parentf213f069fb57996505f9d6c9dd0f4a3ef53e87e4 (diff)
downloadgit-b309a9710899dab2f76455526f573a90fad5d13c.zip
git-b309a9710899dab2f76455526f573a90fad5d13c.tar.gz
git-b309a9710899dab2f76455526f573a90fad5d13c.tar.bz2
reset: extract reset_head() from rebase
Continue the process of lib-ifying the autostash code. In a future commit, this will be used to implement `--autostash` in other builtins. This patch is best viewed with `--color-moved`. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f709fc3..338fb55 100644
--- a/Makefile
+++ b/Makefile
@@ -970,6 +970,7 @@ LIB_OBJS += replace-object.o
LIB_OBJS += repo-settings.o
LIB_OBJS += repository.o
LIB_OBJS += rerere.o
+LIB_OBJS += reset.o
LIB_OBJS += resolve-undo.o
LIB_OBJS += revision.o
LIB_OBJS += run-command.o