aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/libxfs/xfs_metadir.h
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/libxfs/xfs_metadir.h')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-17 15:30:49 +0000
n class='insertions'>+66 This patch adds a DISCUSSION section that contains some tables to show how the different "git reset" options work depending on the states of the files in the working tree, the index, HEAD and the target commit. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-12-30reset: improve mixed reset error message when in a bare repoChristian Couder1-0/+4 When running a "git reset --mixed" in a bare repository, the message displayed is something like: fatal: This operation must be run in a work tree fatal: Could not reset index file to revision 'HEAD^'. This message is a little bit misleading because a mixed reset is ok in a git directory, so it is not absolutely needed to run it in a work tree. So this patch improves upon the above by changing the message to: fatal: mixed reset is not allowed in a bare repository And if "git reset" is ever sped up by using unpack_tree() directly (instead of execing "git read-tree"), this patch will also make sure that a mixed reset is still disallowed in a bare repository. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-12-23Git 1.6.6v1.6.6Junio C Hamano3-4/+6 Signed-off-by: Junio C Hamano <gitster@pobox.com>