diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-10-31 14:59:33 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-11-10 08:49:26 -0800 |
| commit | f6ce1f25885f3db71935b201c5e3c858eb993f5c (patch) | |
| tree | 142b6e4f329efcbc57c204779f0d77b52ffd9419 /git-sh-setup.sh | |
| parent | Fix a formatting error in git-merge.txt (diff) | |
| download | tgif-f6ce1f25885f3db71935b201c5e3c858eb993f5c.tar.xz | |
cherry-pick/revert: transparently refresh index
A stat-dirty index is not a detail that ought to concern the operator
of porcelain such as "git cherry-pick".
Without this change, a cherry-pick after copying a worktree with rsync
errors out with a misleading message.
$ git cherry-pick build/top
error: Your local changes to 'file.h' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.
Noticed-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions