質問編集履歴
4
修正依頼、追記
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
プロジェクトディレクトリに`figures/`というディレクトリを作って、`README.md`に使用する画像をまとめていました。しかしpushしてリモートのリポジトリを見たところ`figures/`がアップロードされておらず、もちろん`README.md`にも画像は現れていません。
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
@@ -51,3 +51,313 @@
|
|
|
51
51
|
|
|
52
52
|
|
|
53
53
|
どなたか解決方法わかる方いませんか？ よろしくお願いします。
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
|
|
58
|
+
|
|
59
|
+
-----
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
|
|
63
|
+
# 追記
|
|
64
|
+
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
`git add --force figures`でうまく行きました。
|
|
68
|
+
|
|
69
|
+
|
|
70
|
+
|
|
71
|
+
```bash
|
|
72
|
+
|
|
73
|
+
$ git status
|
|
74
|
+
|
|
75
|
+
On branch dev
|
|
76
|
+
|
|
77
|
+
nothing to commit, working tree clean
|
|
78
|
+
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
$ git add -f figures
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
|
|
85
|
+
$ git status
|
|
86
|
+
|
|
87
|
+
On branch dev
|
|
88
|
+
|
|
89
|
+
Changes to be committed:
|
|
90
|
+
|
|
91
|
+
(use "git restore --staged <file>..." to unstage)
|
|
92
|
+
|
|
93
|
+
new file: figures/_2021-06-18_23.33.58.png
|
|
94
|
+
|
|
95
|
+
new file: figures/_2021-06-18_23.38.27.png
|
|
96
|
+
|
|
97
|
+
new file: figures/_2021-06-18_23.43.57.png
|
|
98
|
+
|
|
99
|
+
new file: figures/_2021-06-18_23.49.33.png
|
|
100
|
+
|
|
101
|
+
new file: figures/_2021-06-18_23.58.07.png
|
|
102
|
+
|
|
103
|
+
new file: figures/_2021-06-19_0.01.17.png
|
|
104
|
+
|
|
105
|
+
new file: figures/_2021-06-19_0.15.25.png
|
|
106
|
+
|
|
107
|
+
new file: figures/_2021-06-19_0.51.33.png
|
|
108
|
+
|
|
109
|
+
new file: figures/_2021-06-19_1.11.51.png
|
|
110
|
+
|
|
111
|
+
new file: figures/test
|
|
112
|
+
|
|
113
|
+
|
|
114
|
+
|
|
115
|
+
|
|
116
|
+
|
|
117
|
+
$ git commit -m "add figures"
|
|
118
|
+
|
|
119
|
+
[dev da4d022] add figures
|
|
120
|
+
|
|
121
|
+
10 files changed, 0 insertions(+), 0 deletions(-)
|
|
122
|
+
|
|
123
|
+
create mode 100644 figures/_2021-06-18_23.33.58.png
|
|
124
|
+
|
|
125
|
+
create mode 100644 figures/_2021-06-18_23.38.27.png
|
|
126
|
+
|
|
127
|
+
create mode 100644 figures/_2021-06-18_23.43.57.png
|
|
128
|
+
|
|
129
|
+
create mode 100644 figures/_2021-06-18_23.49.33.png
|
|
130
|
+
|
|
131
|
+
create mode 100644 figures/_2021-06-18_23.58.07.png
|
|
132
|
+
|
|
133
|
+
create mode 100644 figures/_2021-06-19_0.01.17.png
|
|
134
|
+
|
|
135
|
+
create mode 100644 figures/_2021-06-19_0.15.25.png
|
|
136
|
+
|
|
137
|
+
create mode 100644 figures/_2021-06-19_0.51.33.png
|
|
138
|
+
|
|
139
|
+
create mode 100644 figures/_2021-06-19_1.11.51.png
|
|
140
|
+
|
|
141
|
+
create mode 100644 figures/test
|
|
142
|
+
|
|
143
|
+
|
|
144
|
+
|
|
145
|
+
$ git push origin dev
|
|
146
|
+
|
|
147
|
+
Enumerating objects: 14, done.
|
|
148
|
+
|
|
149
|
+
Counting objects: 100% (14/14), done.
|
|
150
|
+
|
|
151
|
+
Delta compression using up to 8 threads
|
|
152
|
+
|
|
153
|
+
Compressing objects: 100% (12/12), done.
|
|
154
|
+
|
|
155
|
+
Writing objects: 100% (13/13), 14.97 MiB | 3.09 MiB/s, done.
|
|
156
|
+
|
|
157
|
+
Total 13 (delta 1), reused 0 (delta 0), pack-reused 0
|
|
158
|
+
|
|
159
|
+
remote:
|
|
160
|
+
|
|
161
|
+
remote: To create a merge request for dev, visit:
|
|
162
|
+
|
|
163
|
+
remote: https://gitlab.<organization>/<my_username>/<repository>/-/merge_requests/new?merge_request%5Bsource_branch%5D=dev
|
|
164
|
+
|
|
165
|
+
remote:
|
|
166
|
+
|
|
167
|
+
To ssh://gitlab.<organization>:7999/<my_username>/<repository>.git
|
|
168
|
+
|
|
169
|
+
b6e7e49..da4d022 dev -> dev
|
|
170
|
+
|
|
171
|
+
```
|
|
172
|
+
|
|
173
|
+
|
|
174
|
+
|
|
175
|
+
`.gitignore`も載せておきます。`figures/`ディレクトリが除外されているようには見えないのですが、なぜでしょう？
|
|
176
|
+
|
|
177
|
+
|
|
178
|
+
|
|
179
|
+
```
|
|
180
|
+
|
|
181
|
+
#########################################################################################################
|
|
182
|
+
|
|
183
|
+
## This is an example .gitignore file for Vivado, please treat it as an example as
|
|
184
|
+
|
|
185
|
+
## it might not be complete. In addition, XAPP 1165 should be followed.
|
|
186
|
+
|
|
187
|
+
#########################################################################################################
|
|
188
|
+
|
|
189
|
+
#########
|
|
190
|
+
|
|
191
|
+
#Exclude all
|
|
192
|
+
|
|
193
|
+
#########
|
|
194
|
+
|
|
195
|
+
*
|
|
196
|
+
|
|
197
|
+
!*/
|
|
198
|
+
|
|
199
|
+
!.gitignore
|
|
200
|
+
|
|
201
|
+
###########################################################################
|
|
202
|
+
|
|
203
|
+
## VIVADO
|
|
204
|
+
|
|
205
|
+
###########################################################################
|
|
206
|
+
|
|
207
|
+
#########
|
|
208
|
+
|
|
209
|
+
#Source files:
|
|
210
|
+
|
|
211
|
+
#########
|
|
212
|
+
|
|
213
|
+
#Do NOT ignore VHDL, Verilog, block diagrams or EDIF files.
|
|
214
|
+
|
|
215
|
+
!*.vhd
|
|
216
|
+
|
|
217
|
+
!*.v
|
|
218
|
+
|
|
219
|
+
!*.bd
|
|
220
|
+
|
|
221
|
+
!*.edif
|
|
222
|
+
|
|
223
|
+
#########
|
|
224
|
+
|
|
225
|
+
#IP files
|
|
226
|
+
|
|
227
|
+
#########
|
|
228
|
+
|
|
229
|
+
#.xci: synthesis and implemented not possible - you need to return back to the previous version to generate output products
|
|
230
|
+
|
|
231
|
+
#.xci + .dcp: implementation possible but not re-synthesis
|
|
232
|
+
|
|
233
|
+
#*.xci(www.spiritconsortium.org)
|
|
234
|
+
|
|
235
|
+
!*.xci
|
|
236
|
+
|
|
237
|
+
#*.dcp(checkpoint files)
|
|
238
|
+
|
|
239
|
+
!*.dcp
|
|
240
|
+
|
|
241
|
+
!*.vds
|
|
242
|
+
|
|
243
|
+
!*.pb
|
|
244
|
+
|
|
245
|
+
#All bd comments and layout coordinates are stored within .ui
|
|
246
|
+
|
|
247
|
+
!*.ui
|
|
248
|
+
|
|
249
|
+
!*.ooc
|
|
250
|
+
|
|
251
|
+
#########
|
|
252
|
+
|
|
253
|
+
#System Generator
|
|
254
|
+
|
|
255
|
+
#########
|
|
256
|
+
|
|
257
|
+
!*.mdl
|
|
258
|
+
|
|
259
|
+
!*.slx
|
|
260
|
+
|
|
261
|
+
!*.bxml
|
|
262
|
+
|
|
263
|
+
#########
|
|
264
|
+
|
|
265
|
+
#Simulation logic analyzer
|
|
266
|
+
|
|
267
|
+
#########
|
|
268
|
+
|
|
269
|
+
!*.wcfg
|
|
270
|
+
|
|
271
|
+
!*.coe
|
|
272
|
+
|
|
273
|
+
#########
|
|
274
|
+
|
|
275
|
+
#MIG
|
|
276
|
+
|
|
277
|
+
#########
|
|
278
|
+
|
|
279
|
+
!*.prj
|
|
280
|
+
|
|
281
|
+
!*.mem
|
|
282
|
+
|
|
283
|
+
#########
|
|
284
|
+
|
|
285
|
+
#Project files
|
|
286
|
+
|
|
287
|
+
#########
|
|
288
|
+
|
|
289
|
+
#XPR + *.XML ? XPR (Files are merged into a single XPR file for 2014.1 version)
|
|
290
|
+
|
|
291
|
+
#Do NOT ignore *.xpr files
|
|
292
|
+
|
|
293
|
+
!*.xpr
|
|
294
|
+
|
|
295
|
+
#Include *.xml files for 2013.4 or earlier version
|
|
296
|
+
|
|
297
|
+
!*.xml
|
|
298
|
+
|
|
299
|
+
#########
|
|
300
|
+
|
|
301
|
+
#Constraint files
|
|
302
|
+
|
|
303
|
+
#########
|
|
304
|
+
|
|
305
|
+
#Do NOT ignore *.xdc files
|
|
306
|
+
|
|
307
|
+
!*.xdc
|
|
308
|
+
|
|
309
|
+
#########
|
|
310
|
+
|
|
311
|
+
#TCL - files
|
|
312
|
+
|
|
313
|
+
#########
|
|
314
|
+
|
|
315
|
+
!*.tcl
|
|
316
|
+
|
|
317
|
+
#########
|
|
318
|
+
|
|
319
|
+
#Journal - files
|
|
320
|
+
|
|
321
|
+
#########
|
|
322
|
+
|
|
323
|
+
!*.jou
|
|
324
|
+
|
|
325
|
+
#########
|
|
326
|
+
|
|
327
|
+
#Reports
|
|
328
|
+
|
|
329
|
+
#########
|
|
330
|
+
|
|
331
|
+
!*.rpt
|
|
332
|
+
|
|
333
|
+
!*.txt
|
|
334
|
+
|
|
335
|
+
!*.vdi
|
|
336
|
+
|
|
337
|
+
#########
|
|
338
|
+
|
|
339
|
+
#C-files
|
|
340
|
+
|
|
341
|
+
#########
|
|
342
|
+
|
|
343
|
+
!*.c
|
|
344
|
+
|
|
345
|
+
!*.h
|
|
346
|
+
|
|
347
|
+
!*.elf
|
|
348
|
+
|
|
349
|
+
!*.bmm
|
|
350
|
+
|
|
351
|
+
!*.xmp
|
|
352
|
+
|
|
353
|
+
#!git_push.sh
|
|
354
|
+
|
|
355
|
+
|
|
356
|
+
|
|
357
|
+
|
|
358
|
+
|
|
359
|
+
.DS_Store
|
|
360
|
+
|
|
361
|
+
|
|
362
|
+
|
|
363
|
+
```
|
3
画像を添付した
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
|
|
4
4
|
|
|
5
5
|
プロジェクトディレクトリに`figures/`というディレクトリを作って、`README.md`に使用する画像をまとめていました。しかしpushしてリモートのリポジトリを見たところ`figures/`がアップロードされておらず、もちろん`README.md`にも画像は現れていません。
|
|
6
|
+
|
|
7
|
+
|
|
6
8
|
|
|
7
9
|
|
|
8
10
|
|
2
追記
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -22,6 +22,22 @@
|
|
|
22
22
|
|
|
23
23
|
- 一度消して戻して（`mv figures ../` --> `mv ../figures ./`）、`git status`を見たが変化なし
|
|
24
24
|
|
|
25
|
+
- `touch figures/test`して`git status`を見たが変化なし
|
|
26
|
+
|
|
27
|
+
- パーミッションの問題？
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
```
|
|
32
|
+
|
|
33
|
+
drwxr-xr-x@ 12 <my_user_name> <group> 384B 6 19 01:12 figures/
|
|
34
|
+
|
|
35
|
+
```
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
|
|
25
41
|
|
|
26
42
|
|
|
27
43
|
前に別のプロジェクトで同じことをしていましたが、ちゃんと`figures/`はリモートに反映されていて、`README.md`に画像が現れていました。
|
1
題名が「ファイル」になってた
test
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Gitで特定の
|
|
1
|
+
Gitで特定のディレクトリが管理されない
|
test
CHANGED
|
File without changes
|