summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-12-03 18:00:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-09 21:42:44 -0800
commit1b5b465fbde9515e04bd1e8524a208c92af3555e (patch)
treed00c3e751d8ddee85e01d034f912419eb49afb3f /.gitattributes
parentAdd 'merge' mode to 'git reset' (diff)
downloadtgif-1b5b465fbde9515e04bd1e8524a208c92af3555e.tar.xz
Document "git-reset --merge"
The commit log message for the feature made it sound as if this is a saner version of --mixed, but the use case presented makes it clear that it is a better variant of --hard when your changes and somebody else's changes are mixed together. Perhaps we would want to rewrite the example that shows the use of --hard not to talk about recovering from a failed merge? Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions