diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:19:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:19:24 -0700 |
| commit | 1762224ddb599ab14ca26cedafec39dee9b92fe5 (patch) | |
| tree | 89ba13e49e5e65c5e80e69602cba166ddc543a5b /Documentation/git-merge.txt | |
| parent | open_istream: remove unneeded check for null pointer (diff) | |
| parent | t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges ... (diff) | |
| download | tgif-1762224ddb599ab14ca26cedafec39dee9b92fe5.tar.xz | |
Merge branch 'tr/line-log'
Fix "log -L" command line parsing bugs.
* tr/line-log:
t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges invariant)
line-log: fix "log -LN" crash when N is last line of file
range-set: satisfy non-empty ranges invariant
t4211: demonstrate crash when first -L encountered is empty range
t4211: demonstrate empty -L range crash
range-set: fix sort_and_merge_range_set() corner case bug
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions