summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-05 12:38:39 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-05 12:38:39 -0700
commite3e9af5baefff0ad6ab683dae438111db626a6c6 (patch)
tree9edcb0f8951ac0725a886c9203246d501f7eebb9 /commit.h
parent7d1b50981277c59a788298751f121567a1e75202 (diff)
parentd44e71261f91d3cc81293e0976bb40daa8abb583 (diff)
downloadgit-e3e9af5baefff0ad6ab683dae438111db626a6c6.tar.gz
Merge branch 'sb/maint-pull-rebase'
* sb/maint-pull-rebase: pull: support rebased upstream + fetch + pull --rebase t5520-pull: Test for rebased upstream + fetch + pull --rebase
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions