summaryrefslogtreecommitdiff
path: root/git-reset.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-23 15:07:47 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-23 15:07:47 -0700
commitdcaad49c928f047d5ffa1c5a1753aff6e87f16b5 (patch)
treea688a7fcc3922b37fb72a5d52c00928ac5667bdb /git-reset.sh
parentMerge branch 'eb/mailinfo' into next (diff)
parentMerge part of 'js/fmt-patch' for RFC2822 dates into 'sp/reflog' (diff)
downloadtgif-dcaad49c928f047d5ffa1c5a1753aff6e87f16b5.tar.xz
Merge branch 'sp/reflog' into next
* sp/reflog: Enable ref log creation in git checkout -b. Create/delete branch ref logs. Include ref log detail in commit, reset, etc. Change order of -m option to update-ref. Correct force_write bug in refs.c Change 'master@noon' syntax to 'master@{noon}'. Log ref updates made by fetch. Force writing ref if it doesn't exist. Added logs/ directory to repository layout. General ref log reading improvements. Fix ref log parsing so it works properly. Support 'master@2 hours ago' syntax Log ref updates to logs/refs/<ref> Convert update-ref to use ref_lock API. Improve abstraction of ref lock/write.
Diffstat (limited to 'git-reset.sh')
-rwxr-xr-xgit-reset.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-reset.sh b/git-reset.sh
index 0ee3e3e154..296f3b779b 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -48,7 +48,7 @@ then
else
rm -f "$GIT_DIR/ORIG_HEAD"
fi
-git-update-ref HEAD "$rev"
+git-update-ref -m "reset $reset_type $@" HEAD "$rev"
case "$reset_type" in
--hard )