質問編集履歴

1

誤字

2021/06/29 06:20

投稿

unionbiz
unionbiz

スコア32

test CHANGED
File without changes
test CHANGED
@@ -11,30 +11,6 @@
11
11
 
12
12
 
13
13
  ```
14
-
15
- warning: Pulling without specifying how to reconcile divergent branches is
16
-
17
- discouraged. You can squelch this message by running one of the following
18
-
19
- commands sometime before your next pull:
20
-
21
-
22
-
23
- git config pull.rebase false # merge (the default strategy)
24
-
25
- git config pull.rebase true # rebase
26
-
27
- git config pull.ff only # fast-forward only
28
-
29
-
30
-
31
- You can replace "git config" with "git config --global" to set a default
32
-
33
- preference for all repositories. You can also pass --rebase, --no-rebase,
34
-
35
- or --ff-only on the command line to override the configured default per
36
-
37
- invocation.
38
14
 
39
15
 
40
16