summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-09 13:37:01 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-09 13:37:01 -0800
commit1ee740e66975adbab080301ebd364e253be3d513 (patch)
tree672932e73881b55204ec237b9047c8532d891a61 /environment.c
parentef87690b27fd1facdc8cc48f6789a930939303a3 (diff)
parent6b37dff17f176d7e87efa93b4cf521dd725de247 (diff)
downloadgit-1ee740e66975adbab080301ebd364e253be3d513.tar.gz
Merge branch 'ab/pull-rebase-config'
* ab/pull-rebase-config: pull: introduce a pull.rebase option to enable --rebase
Diffstat (limited to 'environment.c')
0 files changed, 0 insertions, 0 deletions