Changeset 207416 in webkit
- Timestamp:
- Oct 17, 2016 10:59:17 AM (8 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r207406 r207416 1 2016-10-17 Fujii Hironori <Hironori.Fujii@sony.com> 2 3 resolve-ChangeLogs: Specify --no-page to git diff 4 https://bugs.webkit.org/show_bug.cgi?id=163441 5 6 Reviewed by Darin Adler. 7 8 resolve-ChangeLogs shows the result after resolving by invoking 9 'git diff'. It runs a pager for every ChangeLog if it is under 10 TTY. 11 12 * Scripts/resolve-ChangeLogs: 13 (showStatus): Specify '--no-page' to git diff. 14 1 15 2016-10-17 Michael Catanzaro <mcatanzaro@igalia.com> 2 16 -
trunk/Tools/Scripts/resolve-ChangeLogs
r178686 r207416 488 488 my @args = qw(--name-status); 489 489 unshift @args, qw(--cached) if $isConflictResolved; 490 system($GIT, " diff", @args, $file);490 system($GIT, "--no-pager", "diff", @args, $file); 491 491 } else { 492 492 die "Unknown version control system";
Note: See TracChangeset
for help on using the changeset viewer.