chiark / gitweb /
Split brain: quiltify_trees_differ: Improve doc comment
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 11:58:32 +0000 (12:58 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:47 +0000 (16:47 +0100)
dgit

diff --git a/dgit b/dgit
index 4ac5748..3e4741f 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2513,8 +2513,9 @@ END
 sub quiltify_trees_differ ($$;$) {
     my ($x,$y,$finegrained) = @_;
     # returns true iff the two tree objects differ other than in debian/
-    # returns bitmas 01 - differ in upstream files except .gitignore
-    #                02 - differ in .gitignore
+    # with $finegrained,
+    # returns bitmask 01 - differ in upstream files except .gitignore
+    #                 02 - differ in .gitignore
     local $/=undef;
     my @cmd = (@git, qw(diff-tree --name-only -z));
     push @cmd, qw(-r) if $finegrained;