summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-10-31 11:50:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-31 11:50:20 -0700
commitef59f324b0a61ce8a74fd6d1e10773739e335280 (patch)
treeb08d2632e271ee2b538486913efcfa0c7cc223bd /mergetools/vimdiff
parentMerge branch 'jc/push-cert' (diff)
parentgit-svn: use SVN::Ra::get_dir2 when possible (diff)
downloadtgif-ef59f324b0a61ce8a74fd6d1e10773739e335280.tar.xz
Merge branch 'for-junio' of git://bogomips.org/git-svn
* 'for-junio' of git://bogomips.org/git-svn: git-svn: use SVN::Ra::get_dir2 when possible git-svn: add space after "W:" prefix in warning git-svn: (cleanup) remove editor param passing git-svn: prepare SVN::Ra config pieces once Git.pm: add specified name to tempfile template git-svn: disable _rev_list memoization git-svn: save a little memory as fetch progresses git-svn: remove unnecessary DESTROY override git-svn: reload RA every log-window-size git-svn.txt: advertise pushurl with dcommit git-svn: remove mergeinfo rev caching git-svn: cache only mergeinfo revisions git-svn: reduce check_cherry_pick cache overhead git-svn: only look at the root path for svn:mergeinfo git-svn: only look at the new parts of svn:mergeinfo
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions