File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ are not part of the current project most users will want to expire
89
89
them sooner. This option defaults to '30 days'.
90
90
91
91
The above two configuration variables can be given to a pattern. For
92
- example, this sets non-default expiry values only to remote tracking
92
+ example, this sets non-default expiry values only to remote- tracking
93
93
branches:
94
94
95
95
------------
@@ -128,8 +128,8 @@ Notes
128
128
129
129
'git gc' tries very hard to be safe about the garbage it collects. In
130
130
particular, it will keep not only objects referenced by your current set
131
- of branches and tags, but also objects referenced by the index, remote
132
- tracking branches, refs saved by 'git filter-branch' in
131
+ of branches and tags, but also objects referenced by the index,
132
+ remote- tracking branches, refs saved by 'git filter-branch' in
133
133
refs/original/, or reflogs (which may reference commits in branches
134
134
that were later amended or rewound).
135
135
Original file line number Diff line number Diff line change @@ -402,8 +402,8 @@ could merge the changes into her master branch:
402
402
alice$ git merge bob/master
403
403
-------------------------------------
404
404
405
- This `merge` can also be done by 'pulling from her own remote
406
- tracking branch', like this:
405
+ This `merge` can also be done by 'pulling from her own remote-tracking
406
+ branch', like this:
407
407
408
408
-------------------------------------
409
409
alice$ git pull . remotes/bob/master
Original file line number Diff line number Diff line change @@ -129,7 +129,7 @@ test_expect_success 'denyNonFastforwards trumps --force' '
129
129
test "$victim_orig" = "$victim_head"
130
130
'
131
131
132
- test_expect_success ' push --all excludes remote tracking hierarchy' '
132
+ test_expect_success ' push --all excludes remote- tracking hierarchy' '
133
133
mkdir parent &&
134
134
(
135
135
cd parent &&
You can’t perform that action at this time.
0 commit comments