diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:48:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:48:08 -0800 |
| commit | 11f1df190fcc3ac9c3263a3eba8104cbdee4787d (patch) | |
| tree | d502d6143db9bbb16ca8afac629ff1b4126c9482 /git-read-tree.txt | |
| parent | d71eb7dd5b4fb3cafaa3d603f625c0a0f75373f4 (diff) | |
| download | git-htmldocs-11f1df190fcc3ac9c3263a3eba8104cbdee4787d.tar.gz | |
Autogenerated HTML docs for v2.39.1-388-g2fc9e
Diffstat (limited to 'git-read-tree.txt')
| -rw-r--r-- | git-read-tree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-read-tree.txt b/git-read-tree.txt index 7567955ba..b09707474 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt @@ -219,7 +219,7 @@ see which of the "local changes" that you made were carried forward by running `git diff-index --cached $M`. Note that this does not necessarily match what `git diff-index --cached $H` would have produced before such a two tree merge. This is because of cases -18 and 19 --- if you already had the changes in $M (e.g. maybe +18 and 19 -- if you already had the changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git diff-index --cached $H` would have told you about the change before this merge, but it would not show in `git diff-index --cached $M` |