Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 35017:e61d661b0350

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: clarify that -u only updates linearly Differential Revision: https://phab.mercurial-scm.org/D1355
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 10 Nov 2017 09:44:49 -0800
parents 5910db5d1913
children 6ef744a7df65
comparison
equal deleted inserted replaced
35016:1664dc7ccd8a 35017:e61d661b0350
3916 elif not ui.configbool('commands', 'update.requiredest'): 3916 elif not ui.configbool('commands', 'update.requiredest'):
3917 ui.status(_("(run 'hg update' to get a working copy)\n")) 3917 ui.status(_("(run 'hg update' to get a working copy)\n"))
3918 3918
3919 @command('^pull', 3919 @command('^pull',
3920 [('u', 'update', None, 3920 [('u', 'update', None,
3921 _('update to new branch head if changesets were pulled')), 3921 _('update to new branch head if new descendants were pulled')),
3922 ('f', 'force', None, _('run even when remote repository is unrelated')), 3922 ('f', 'force', None, _('run even when remote repository is unrelated')),
3923 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), 3923 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3924 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), 3924 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3925 ('b', 'branch', [], _('a specific branch you would like to pull'), 3925 ('b', 'branch', [], _('a specific branch you would like to pull'),
3926 _('BRANCH')), 3926 _('BRANCH')),