diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-03 23:50:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-03 23:50:54 -0700 |
| commit | 2515f935b9c1a0afa1b555f173a37d6ad7878fff (patch) | |
| tree | 98d3b3bd6c8ba32c6508cc3bfc0b43cb68da9cd4 /builtin-blame.c | |
| parent | 2e7a9785c27f00a8f7a06edc1d4c9b2f3fa2eeb9 (diff) | |
| parent | ee787400de25ed419f40e70698ba35db475b2d61 (diff) | |
| download | git-2515f935b9c1a0afa1b555f173a37d6ad7878fff.tar.gz | |
Merge branch 'maint'
* maint:
RelNotes-1.5.3.5: fix typo
Delay pager setup in git blame
git-cvsimport: really convert underscores in branch names to dots with -u
Diffstat (limited to 'builtin-blame.c')
| -rw-r--r-- | builtin-blame.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index 8432b823e6..aedc294eac 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -2215,9 +2215,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix) argv[unk++] = arg; } - if (!incremental) - setup_pager(); - if (!blame_move_score) blame_move_score = BLAME_DEFAULT_MOVE_SCORE; if (!blame_copy_score) @@ -2411,6 +2408,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix) read_mailmap(&mailmap, ".mailmap", NULL); + if (!incremental) + setup_pager(); + assign_blame(&sb, &revs, opt); if (incremental) |