![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Dec 2011 21:37:01 +0000 (13:37 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Dec 2011 21:37:01 +0000 (13:37 -0800) | ||
| commit | 1ee740e66975adbab080301ebd364e253be3d513 | |
| tree | 672932e73881b55204ec237b9047c8532d891a61 | tree | snapshot |
| parent | ef87690b27fd1facdc8cc48f6789a930939303a3 | commit | diff |
| parent | 6b37dff17f176d7e87efa93b4cf521dd725de247 | commit | diff |
Merge branch 'ab/pull-rebase-config'
* ab/pull-rebase-config:
pull: introduce a pull.rebase option to enable --rebase
* ab/pull-rebase-config:
pull: introduce a pull.rebase option to enable --rebase
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/git-pull.txt | diff1 | | diff2 | | blob | history |
| git-pull.sh | diff1 | | diff2 | | blob | history |