chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tg-create.sh: Change usage (-d -> arguments)
[topgit.git]
/
README
diff --git
a/README
b/README
index 36316fad1155f1da073a47a3b34bada12bbbb1b0..dc2e5ff320bbf788e2d5aed02602a0753990584b 100644
(file)
--- a/
README
+++ b/
README
@@
-86,9
+86,9
@@
SYNOPSIS
$ ..hack..
$ git commit
$ ..hack..
$ git commit
- ## Create another topic branch on top of
specified one
and submit
+ ## Create another topic branch on top of
master
and submit
## the resulting patch upstream
## the resulting patch upstream
- $ tg create
-d master t/revlist/author-fixed
+ $ tg create
t/revlist/author-fixed master
tg: Creating t/revlist/author-fixed base from master...
$ ..hack..
$ git commit
tg: Creating t/revlist/author-fixed base from master...
$ ..hack..
$ git commit
@@
-100,7
+100,7
@@
SYNOPSIS
Subject: [PATCH] Fix broken revlist --author when --fixed-string
## Create another topic branch depending on two others non-trivially
Subject: [PATCH] Fix broken revlist --author when --fixed-string
## Create another topic branch depending on two others non-trivially
- $ tg create
-d t/revlist/author-fixed,t/gitweb/nifty-links t/whatever
+ $ tg create
t/whatever t/revlist/author-fixed t/gitweb/nifty-links
tg: Creating t/whatever base from t/revlist/author-fixed...
tg: Merging t/whatever base with t/gitweb/nifty-links...
Merge failed!
tg: Creating t/whatever base from t/revlist/author-fixed...
tg: Merging t/whatever base with t/gitweb/nifty-links...
Merge failed!
@@
-199,8
+199,8
@@
tg create
~~~~~~~~~
Create a new TopGit-controlled topic branch of a given name
(required argument) and switch to it. If no dependencies
~~~~~~~~~
Create a new TopGit-controlled topic branch of a given name
(required argument) and switch to it. If no dependencies
- are specified
using the '-d' paremeter, the current branch
- is assumed to be the only dependency.
+ are specified
(by extra arguments passed after the first one),
+
the current branch
is assumed to be the only dependency.
After `tg create`, you should insert the patch description
to the '.topmsg' file.
After `tg create`, you should insert the patch description
to the '.topmsg' file.
@@
-212,10
+212,6
@@
tg create
it will detect that you are on a topic branch base ref and
resume the topic branch creation operation.
it will detect that you are on a topic branch base ref and
resume the topic branch creation operation.
- '-d':
- Manually specified dependencies. A comma- or
- space-separated list of branch names.
-
tg delete
~~~~~~~~~
Remove a TopGit-controlled topic branch of given name
tg delete
~~~~~~~~~
Remove a TopGit-controlled topic branch of given name
@@
-278,8
+274,8
@@
tg update
TODO: Some infrastructure for sharing topic branches between
repositories easily
TODO: tg depend for adding/removing dependencies smoothly
TODO: Some infrastructure for sharing topic branches between
repositories easily
TODO: tg depend for adding/removing dependencies smoothly
-TODO: tg
tidy for creating a one-commit-per-patch tidied up history
- (for pulling by upstream)
+TODO: tg
collapse for creating a one-commit-per-patch tidied up
+
history
(for pulling by upstream)
IMPLEMENTATION
IMPLEMENTATION