diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:00:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:00:43 -0800 |
| commit | 0ebd5d7186237663a642397214232e5fe2fba21d (patch) | |
| tree | c94682d4abf341bdc6df2785b73faa6e796ff045 /git-merge.sh | |
| parent | Merge branch 'wc/rebase-insn' (diff) | |
| parent | Teach 'git pull' about --rebase (diff) | |
| download | tgif-0ebd5d7186237663a642397214232e5fe2fba21d.tar.xz | |
Merge branch 'js/pull-rebase'
* js/pull-rebase:
Teach 'git pull' about --rebase
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions