diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-11-17 14:59:16 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 14:59:16 -0800 |
commit | 8cf666c9eea7d6c40784efde545c9d00edea1959 (patch) | |
tree | 1ce34625dfb8431fb80611ae5f0d55c0bb7ef169 /git-merge-octopus.sh | |
parent | Merge branch 'jk/no-textconv-symlink' (diff) | |
parent | diff: avoid repeated scanning while looking for funcname (diff) | |
download | tgif-8cf666c9eea7d6c40784efde545c9d00edea1959.tar.xz |
Merge branch 'cb/diff-fname-optim'
* cb/diff-fname-optim:
diff: avoid repeated scanning while looking for funcname
do not search functions for patch ID
add rebase patch id tests
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions