Longer file names with git merge

So, I have a Git project, and we (basically a typical Rails project) have a pretty deep directory structure.

When I do a git merge, I see results like:

app/views/shared/exception_report.erb              |    6 +
app/views/ui/sample.html.erb                       |   11 +-
app/views/verifications/new.html.erb               |   10 +-
config/deploy.rb                                   |    2 +-
.../20100825132200_thing_pane.rb                   |   27 ++---
.../20100826210000_another_thing_pane.rb           |   21 +++
lib/semantic_form_builder_plus.rb                  |    5 +

The problem is that I want to see what the directory is .../20100825132200_thing_pane.rb. Is there a Git parameter that controls the number of columns that these rows take?

tl; dr : Git names of the added / changed list merge lists, but will drop the file path too quickly for my purposes. Can I control the number of Git columns when it prints this list of file names?

Change for future / future Googlers sake . I accepted this answer and created a Slake Rake task to make it very simple: incoming_migration_check.rake .

+3
1

, diffstat.

--no-commit, diff --stat=width,name-width, diffstat . diff HEAD^ , .

+2

Source: https://habr.com/ru/post/1762914/


All Articles