Skip to main content

Browse the archive

Staging
v0.5.2
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 3368d11f308eb4ba2ad5703aa059bb0e5a82212f authored by Jürgen Rühle on 07 January 2007, 19:18:26 UTC, committed by Junio C Hamano on 08 January 2007, 02:04:57 UTC 
Remove unnecessary git-rm --cached reference from status output
 
Since git-reset has learned restoring the absence of paths git-rm --cached is
no longer necessary. Therefore remove it from the cached content header hint.

Also remove the unfortunate wording 'Cached' from the header itself.

Signed-off-by: Jürgen Rühle <j-r@online.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 515377e
Raw File
Tip revision: 3368d11f308eb4ba2ad5703aa059bb0e5a82212f authored by Jürgen Rühle on 07 January 2007, 19:18:26 UTC
Remove unnecessary git-rm --cached reference from status output
Tip revision: 3368d11
git-merge-ours.sh 
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#

# We need to exit with 2 if the index does not match our HEAD tree,
# because the current index is what we will be committing as the
# merge result.

test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2

exit 0
back to top