![[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) |
* ab/pull-rebase-config:
pull: introduce a pull.rebase option to enable --rebase
pull: introduce a pull.rebase option to enable --rebase
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/config.txt | patch | | diff1 | | diff2 | | blob | history |
| Documentation/git-pull.txt | patch | | diff1 | | diff2 | | blob | history |
| git-pull.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/config.txt
Simple merge
diff --cc Documentation/git-pull.txt
Simple merge
diff --cc git-pull.sh
Simple merge