diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-26 21:37:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-26 21:37:21 (GMT) |
| commit | 1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881 (patch) | |
| tree | 9e67ad97cdf84b3ffaf501f3bf62ed040cacb522 /xdiff/xmerge.c | |
| parent | 2a24444aaeaabd8559751b02015c025157604f38 (diff) | |
| parent | f6b1fb372ee164e4cb2d15a9a325e13685f9dc2d (diff) | |
| download | git-1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881.zip git-1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881.tar.gz git-1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881.tar.bz2 | |
Merge branch 'mm/push-simple-doc'
The documentation did not clearly state that the 'simple' mode is
now the default for "git push" when push.default configuration is
not set.
* mm/push-simple-doc:
Documentation/git-push: document that 'simple' is the default
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions