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:
f158f5f
)
wip found
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 28 Apr 2017 13:13:37 +0000
(14:13 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 19 Jan 2018 18:06:45 +0000
(18:06 +0000)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index a9f7a1abb457888e2f4879417bcb50b13b157779..03e404046964aa7c551c101446e35db2ec9e8f14 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-63,7
+63,7
@@
# - no fast forward checks
# for now only explicit with commitids
# - no fast forward checks
# for now only explicit with commitids
-
#
implicitly uses `upstream'
+
#
implicitly uses `upstream'
# # (or multiple other branches)
# git-debrebase new-upstream \
# [<subdir>/]=<commitid>
# # (or multiple other branches)
# git-debrebase new-upstream \
# [<subdir>/]=<commitid>
@@
-89,8
+89,10
@@
# zero, one, or both of these may exist
s
# git-debrebase without start, if already started, is willing
# zero, one, or both of these may exist
s
# git-debrebase without start, if already started, is willing
-# to strip pseudomerges provided that they overwrite
(xxx exactly ???)
+# to strip pseudomerges provided that they overwrite
exactly
# the previous HEAD
# the previous HEAD
+# xxxx is this right ? what matters is have we pushed
+# the previous pseudomerge check for tags and remote branches ?
use strict;
use strict;