chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
63911b5
)
git-debrebase: wip notes
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 22 Feb 2017 18:35:02 +0000
(18:35 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000
(12:25 +0100)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index fbb97329d549328ef775fc087e528904d462e872..71167e89f3e972eb8d48d95448293c7e61bd165e 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-19,13
+19,15
@@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# usages:
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# usages:
-# git-debrebase launder # prints breakwater tip
-# git-debrebase analyse
+# git-debrebase status
# git-debrebase start # like ffrebase start + debrebase launder
# git-debrebase start # like ffrebase start + debrebase launder
-# git-debrebase create-new-upstream [-f] <upstreaminfo>
-# git-debrebase new-upstream [-f] <upstreaminfo>
+# git-debrebase new-upstream [-f] <upstreaminfo>...
# git-debrebase <git-rebase options> # does debrebase start if necessary
#
# git-debrebase <git-rebase options> # does debrebase start if necessary
#
+# git-debrebase analyse
+# git-debrebase launder # prints breakwater tip
+# git-debrebase create-new-upstream-breakwater [-f] <upstreaminfo>...
+#
# <upstreaminfo> is
# [,][<subdir>:][+]<commitid>[,...]
#
# <upstreaminfo> is
# [,][<subdir>:][+]<commitid>[,...]
#
@@
-414,7
+416,7
@@
sub update_head ($$) {
sub cmd_launder () {
my $old = get_head();
my ($tip,$breakwater) = launder $old, 0, undef, 0;
sub cmd_launder () {
my $old = get_head();
my ($tip,$breakwater) = launder $old, 0, undef, 0;
- update_head $old, $tip, 'launder'; # no tree changes!
+ update_head $old, $tip, 'launder'; # no tree changes!
xxx debian/patches
printf "# breakwater tip:\n%s\n", $breakwater;
}
printf "# breakwater tip:\n%s\n", $breakwater;
}