diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-24 21:29:47 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-28 08:02:04 -0700 |
| commit | dfcef29f2f32046f3edbcaee47a03d94bc237eb8 (patch) | |
| tree | 5a72046098e68285cfa595147e5b676019483476 /merge-recursive.c | |
| parent | remote-hg: reorganize bookmark handling (diff) | |
| download | tgif-dfcef29f2f32046f3edbcaee47a03d94bc237eb8.tar.xz | |
remote-hg: force remote bookmark push selectively
If we update the 'old' node, we might be updating the remote bookmark
even when our 'new' node is not related at all to what the remote has,
effectively forcing an update.
Let's do that only when forced push is configured.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions