summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 20:31:41 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 21:00:31 +0100
commit8d7ae3032f607936deb0b63109b710eb4381aa55 (patch)
tree899de689447ad91cf212edf980daf4d48204d7ff /git-debrebase
parent5caa54e103693bd97c41251d803df83d7ab0c155 (diff)
git-debrebase: Merge: Put off some xxx's, making them MERGE-TODO
We are going to release with this machinery in this experimental state. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase
index 2e027f5..bee0249 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -446,7 +446,7 @@ sub gbp_pq_export ($$$) {
}
-# xxx allow merge resolution separately from laundering, before git merge
+# MERGE-TODO allow merge resolution separately from laundering, before git merge
# later/rework?
# use git-format-patch?
@@ -1308,7 +1308,7 @@ sub walk ($;$$$) {
# which was reachable via ffq-prev is no longer findable.
# This is suboptimal, but if it all works we'll have done
# the right thing.
- # xxx we should warn the user in the docs about this
+ # MERGE-TODO we should warn the user in the docs about this
my $ok=1;
my $best_anchor;
@@ -2757,7 +2757,7 @@ END
sub cmd_record_resolved_merge () {
badusage "record-resolved-merge takes no further arguments" if @ARGV;
- # xxx needs documentation
+ # MERGE-TODO needs documentation
my $new = get_head();
my $method;