stg-pull(1) — Linux manual page

NAME \| SYNOPSIS \| DESCRIPTION \| OPTIONS \| STGIT \| COLOPHON

STG-PULL(1)                   StGit Manual                   STG-PULL(1)

NAME top

       stg-pull - Pull changes from a remote repository

SYNOPSIS top

       stg pull [OPTIONS] [repository]

DESCRIPTION top

       Pull the latest changes from a remote repository.

       The remote repository may be specified on the command line, but
       defaults to branch.<name>.remote from the git configuration, or
       "origin" if not configured.

       This command works by popping all currently applied patches from
       the stack, pulling the changes from the remote repository,
       updating the stack base to the new remote HEAD, and finally
       pushing all formerly applied patches back onto the stack. Merge
       conflicts may occur during the final push step. Those conflicts
       need to be resolved manually.

       See git-fetch(1) for the format of remote repository argument.

OPTIONS top

       -n, --nopush
           Do not push back patches after pulling

       -m, --merged
           Check for patches that may have been merged upstream.

           When pushing-back patches, each patch is checked to see if
           its changes already exist in the just-pulled upstream
           changes. If a patch’s changes have already been merged
           upstream, the patch will still exist in the stack, but become
           empty after the pull operation.

       --conflicts[=<policy>]
           Either "allow" or "disallow" pushing a patch with conflicts.

           Using --conflicts=allow (or just --conflicts) allows pushing
           a patch that may result in unresolved merge conflicts. The
           patch will be pushed and files with conflicts will be left
           with conflict markers to be resolved manually; or the
           operation undone with stg undo --hard. This is the default
           behavior and also corresponds to the
           "stgit.push.allow-conflicts" variable being set to "true".

           Using --conflicts=disallow disallows pushing any patch that
           would result in merge conflicts. The operation will stop on
           the last patch that can be pushed without conflicts. This
           behavior can be configured by setting
           "stgit.push.allow-conflicts" to "false".

STGIT top

       Part of the StGit suite - see stg(1)

COLOPHON top

       This page is part of the stgit (Stacked Git) project.
       Information about the project can be found at 
       ⟨http://www.procode.org/stgit/⟩.  If you have a bug report for
       this manual page, see ⟨http://www.procode.org/stgit/⟩.  This page
       was obtained from the project's upstream Git repository
       ⟨https://github.com/stacked-git/stgit.git⟩ on 2024-06-14.  (At
       that time, the date of the most recent commit that was found in
       the repository was 2024-05-22.)  If you discover any rendering
       problems in this HTML version of the page, or you believe there
       is a better or more up-to-date source for the page, or you have
       corrections or improvements to the information in this COLOPHON
       (which is not part of the original manual page), send a mail to
       [email protected]

StGit 2.4.7                    06/14/2024                    STG-PULL(1)

Pages that refer to this page: stg(1), stg-branch(1)