]> granicus.if.org Git - git/commit
Merge branch 'js/range-diff' into es/format-patch-rangediff
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Aug 2018 21:21:46 +0000 (14:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Aug 2018 21:22:21 +0000 (14:22 -0700)
commitfe8f41fb2a61b36d51099f895e9902fcccc2a2df
treea6e3756cb551ffc507ca6d80e89db3b401b490bd
parent1d89318c48d233d52f1db230cf622935ac3c69fa
parenta7be92acd96007bcb4c1fd4e8602eeb5115312c2
Merge branch 'js/range-diff' into es/format-patch-rangediff

* js/range-diff: (21 commits)
  range-diff: use dim/bold cues to improve dual color mode
  range-diff: make --dual-color the default mode
  range-diff: left-pad patch numbers
  completion: support `git range-diff`
  range-diff: populate the man page
  range-diff --dual-color: skip white-space warnings
  range-diff: offer to dual-color the diffs
  diff: add an internal option to dual-color diffs of diffs
  color: add the meta color GIT_COLOR_REVERSE
  range-diff: use color for the commit pairs
  range-diff: add tests
  range-diff: do not show "function names" in hunk headers
  range-diff: adjust the output of the commit pairs
  range-diff: suppress the diff headers
  range-diff: indent the diffs just like tbdiff
  range-diff: right-trim commit messages
  range-diff: also show the diff between patches
  range-diff: improve the order of the shown commits
  range-diff: first rudimentary implementation
  Introduce `range-diff` to compare iterations of a topic branch
  ...