diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2010-09-15 22:47:43 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-18 15:14:26 -0700 |
| commit | 9980d7de93b1bd932f16478349dce30209070387 (patch) | |
| tree | 47c09d798f5cf7d555a86fdcfa95b2123ffdfbb5 /git-merge-resolve.sh | |
| parent | git-reset.txt: use "working tree" consistently (diff) | |
| download | tgif-9980d7de93b1bd932f16478349dce30209070387.tar.xz | |
git-reset.txt: point to git-checkout
for the case of updating a file in index and worktree, or from the index
to the worktree.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions