summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2011-03-09 21:52:15 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-09 14:28:24 -0800
commit251df09be3af658404f5f5f670a013d5806645d4 (patch)
tree01da419ad405179afd0765bcd77a89390a8e055c /Documentation/git-merge-one-file.txt
parentSubmittingPatches: clarify the expected commit log description (diff)
downloadtgif-251df09be3af658404f5f5f670a013d5806645d4.tar.xz
log: fix --max-count when used together with -S or -G
The --max-count limit is implemented by counting revisions in get_revision(), but the -S and -G take effect later when running diff. Hence "--max-count=10 -Sfoo" meant "examine the 10 first revisions, and out of them, show only those changing the occurences of foo", not "show 10 revisions changing the occurences of foo". In case the commit isn't actually shown, cancel the decrement of max_count. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions