equal
deleted
inserted
replaced
65 $ echo gamma > gamma |
65 $ echo gamma > gamma |
66 $ git status |
66 $ git status |
67 On branch master |
67 On branch master |
68 Untracked files: |
68 Untracked files: |
69 (use "git add <file>..." to include in what will be committed) |
69 (use "git add <file>..." to include in what will be committed) |
|
70 (?) |
70 gamma |
71 gamma |
71 |
72 |
72 nothing added to commit but untracked files present (use "git add" to track) |
73 nothing added to commit but untracked files present (use "git add" to track) |
73 |
74 |
74 Without creating the .hg, hg status fails: |
75 Without creating the .hg, hg status fails: |
132 ? gamma |
133 ? gamma |
133 $ git status |
134 $ git status |
134 On branch master |
135 On branch master |
135 Untracked files: |
136 Untracked files: |
136 (use "git add <file>..." to include in what will be committed) |
137 (use "git add <file>..." to include in what will be committed) |
|
138 (?) |
137 gamma |
139 gamma |
138 |
140 |
139 nothing added to commit but untracked files present (use "git add" to track) |
141 nothing added to commit but untracked files present (use "git add" to track) |
140 |
142 |
141 Add shows sanely in both: |
143 Add shows sanely in both: |
151 beta |
153 beta |
152 gamma |
154 gamma |
153 $ git status |
155 $ git status |
154 On branch master |
156 On branch master |
155 Changes to be committed: |
157 Changes to be committed: |
156 (use "git restore --staged <file>..." to unstage) |
158 (use "git restore --staged <file>..." to unstage) (?) |
|
159 (use "git reset HEAD <file>..." to unstage) (?) |
|
160 (?) |
157 new file: gamma |
161 new file: gamma |
158 |
162 |
159 |
163 |
160 forget does what it should as well: |
164 forget does what it should as well: |
161 $ hg forget gamma |
165 $ hg forget gamma |
163 ? gamma |
167 ? gamma |
164 $ git status |
168 $ git status |
165 On branch master |
169 On branch master |
166 Untracked files: |
170 Untracked files: |
167 (use "git add <file>..." to include in what will be committed) |
171 (use "git add <file>..." to include in what will be committed) |
|
172 (?) |
168 gamma |
173 gamma |
169 |
174 |
170 nothing added to commit but untracked files present (use "git add" to track) |
175 nothing added to commit but untracked files present (use "git add" to track) |
171 |
176 |
172 clean up untracked file |
177 clean up untracked file |