equal
deleted
inserted
replaced
4020 conflict markers, but enables the user to override the hook if the file |
4020 conflict markers, but enables the user to override the hook if the file |
4021 is using conflict markers for testing purposes or the file format has |
4021 is using conflict markers for testing purposes or the file format has |
4022 strings that look like conflict markers. |
4022 strings that look like conflict markers. |
4023 |
4023 |
4024 By default, servers will ignore `--pushvars`. To enable it add the |
4024 By default, servers will ignore `--pushvars`. To enable it add the |
4025 following to your configuration file |
4025 following to your configuration file:: |
4026 |
4026 |
4027 [push] |
4027 [push] |
4028 pushvars.server = true |
4028 pushvars.server = true |
4029 |
4029 |
4030 Returns 0 if push was successful, 1 if nothing to push. |
4030 Returns 0 if push was successful, 1 if nothing to push. |