aboutsummaryrefslogtreecommitdiffstats
path: root/git-svn.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-10 12:32:59 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-10 12:32:59 -0800
commit3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1 (patch)
tree42fc1b67e7237c5c3913004c53bc8c14dea479c8 /git-svn.perl
parentMerge branch 'vl/maint-openssl-signature-change' (diff)
parentTeach 'git merge' and 'git pull' the option --ff-only (diff)
downloadgit-3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1.tar.gz
git-3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1.zip
Merge branch 'bg/merge-ff-only'
* bg/merge-ff-only: Teach 'git merge' and 'git pull' the option --ff-only
Diffstat (limited to 'git-svn.perl')
0 files changed, 0 insertions, 0 deletions