summaryrefslogtreecommitdiff
path: root/url.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-31 14:54:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-31 14:54:12 -0700
commitad00aebfe93b3fc79c5ed54569f1603b8030783a (patch)
treee41f9df2842aa74a3c692d733e1a09d708c2c413 /url.h
parentMerge branch 'jc/report-path-error-to-dir' into maint (diff)
parentdocs: clarify what git-rebase's "-p" / "--preserve-merges" does (diff)
downloadtgif-ad00aebfe93b3fc79c5ed54569f1603b8030783a.tar.xz
Merge branch 'ss/pull-rebase-preserve' into maint
* ss/pull-rebase-preserve: docs: clarify what git-rebase's "-p" / "--preserve-merges" does docs: clarify "preserve" option wording for git-pull
Diffstat (limited to 'url.h')
0 files changed, 0 insertions, 0 deletions