summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-06-04 12:58:32 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:47 +0100
commit40f91b11738a9d84bd8b329c40003d5ac5f08ec3 (patch)
tree742a196c96910fedcbfd1153dfdd3bbe4e284c07
parent61b51ad1c4b8b949f83c420fa3c2b92215643037 (diff)
Split brain: quiltify_trees_differ: Improve doc comment
-rwxr-xr-xdgit5
1 files changed, 3 insertions, 2 deletions
diff --git a/dgit b/dgit
index 4ac5748..3e4741f 100755
--- 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;