@@ -10,9 +10,6 @@ See http://github.com/ingydotnet/swim-pm#readme
10
10
11
11
git-subrepo - Git Submodule Alternative
12
12
13
- =for html
14
- <a href="https://travis-ci.org/ingydotnet/git-subrepo"><img src="https://travis-ci.org/ingydotnet/git-subrepo.png" alt="git-subrepo"></a>
15
-
16
13
=head1 Synopsis
17
14
18
15
git subrepo -h # Help Overview
@@ -181,7 +178,7 @@ performed. The default option is merge.
181
178
182
179
The C<init> command accepts the C<--branch=> and C<--remote=> options.
183
180
184
- =item C<< git subrepo pull <subdir>|--all [-M|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u] >>
181
+ =item C<< git subrepo pull <subdir>|--all [-M|-R|- f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u] >>
185
182
186
183
Update the subrepo subdir with the latest upstream changes.
187
184
@@ -215,7 +212,7 @@ used for a subrepo C<push> command. See 'push' below for more information. If
215
212
you want to change the method you can use the C<config> command for this.
216
213
217
214
When you pull you can assume a fast-forward strategy (default) or you can
218
- specify a C<--method rebase>, C<--method merge> or C<--force> strategy. The latter is the
215
+ specify a C<--rebase>, C<--merge> or C<--force> strategy. The latter is the
219
216
same as a C<clone --force> operation, using the current remote and branch.
220
217
221
218
Like the C<clone> command, C<pull> will squash all the changes (since the last
@@ -229,7 +226,7 @@ The set of commands used above are described in detail below.
229
226
The C<pull> command accepts the C<--all>, C<--branch=>, C<--edit>, C<--force>,
230
227
C<--message=>, C<--remote=> and C<--update> options.
231
228
232
- =item C<< git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M] [-u] [-f] [-s] [-N] >>
229
+ =item C<< git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R ] [-u] [-f] [-s] [-N] >>
233
230
234
231
Push a properly merged subrepo branch back upstream.
235
232
@@ -254,7 +251,7 @@ discouraged. Only use this option if you fully understand it. (The C<--force>
254
251
option will NOT check for a proper merge. ANY branch will be force pushed!)
255
252
256
253
The C<push> command accepts the C<--all>, C<--branch=>, C<--dry-run>, C<--
257
- force>, C<--method >, C<--remote=>, C<--squash> and C<--
254
+ force>, C<--merge>, C<--rebase >, C<--remote=>, C<--squash> and C<--
258
255
update> options.
259
256
260
257
=item C<< git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>] >>
@@ -426,18 +423,20 @@ Use this option to force certain commands that fail in the general case.
426
423
NOTE: The C<--force> option means different things for different commands.
427
424
Read the command specific doc for the exact meaning.
428
425
429
- =item C<--method=<rebase|merge>> (C<-M>)
430
-
431
- C<merge>: Use a C<merge> strategy to include upstream subrepo commits on a pull
432
- (or setup for push).
426
+ =item C<--merge> (C<-M>)
433
427
434
- C<rebase>: Use a C<rebase > strategy to include upstream subrepo commits on a
435
- pull (or setup for push).
428
+ Use a C<merge > strategy to include upstream subrepo commits on a pull (or
429
+ setup for push).
436
430
437
431
=item C<< --message=<message> >> (C<< -m <message> >>)
438
432
439
433
Specify your own commit message on the command line.
440
434
435
+ =item C<--rebase> (C<-R>)
436
+
437
+ Use a C<rebase> strategy to include upstream subrepo commits on a pull (or
438
+ setup for push).
439
+
441
440
=item C<< --remote=<remote-url> >> (C<< -r <remote-url> >>)
442
441
443
442
Use a different remote-url than the one saved in C<.gitrepo> locally.
0 commit comments