diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:37:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:37:01 -0800 |
| commit | 1ee740e66975adbab080301ebd364e253be3d513 (patch) | |
| tree | 672932e73881b55204ec237b9047c8532d891a61 /notes-merge.c | |
| parent | Merge branch 'rs/allocate-cache-entry-individually' (diff) | |
| parent | pull: introduce a pull.rebase option to enable --rebase (diff) | |
| download | git-1ee740e66975adbab080301ebd364e253be3d513.tar.gz git-1ee740e66975adbab080301ebd364e253be3d513.zip | |
Merge branch 'ab/pull-rebase-config'
* ab/pull-rebase-config:
pull: introduce a pull.rebase option to enable --rebase
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions