diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-04-30 20:09:58 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-30 22:06:47 -0700 |
| commit | 38e7167e9bdc57262c7298912c4bf9df4d68f6fe (patch) | |
| tree | 66b0bd2acb0d2a05a93bfa62f7feae4fe6e2e831 /templates | |
| parent | remote-bzr: add support to push merges (diff) | |
| download | tgif-38e7167e9bdc57262c7298912c4bf9df4d68f6fe.tar.xz | |
remote-bzr: fixes for branch diverge
If the branches diverge we want to reset the pointer to where the remote
actually is. Since we can access remote branches just as easily as local
ones, let's do so.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions