EnglishFrenchSpanish

Ad


OnWorks favicon

git-strip-merge - Online in the Cloud

Run git-strip-merge in OnWorks free hosting provider over Ubuntu Online, Fedora Online, Windows online emulator or MAC OS online emulator

This is the command git-strip-merge that can be run in the OnWorks free hosting provider using one of our multiple free online workstations such as Ubuntu Online, Fedora Online, Windows online emulator or MAC OS online emulator

PROGRAM:

NAME


git-strip-merge - A git-merge wrapper that deletes files on a "foreign" branch before
merging

SYNOPSIS


git-strip-merge [git-merge options] [-M <commitmsg>] <branch> FILE...

DESCRIPTION


git-merge that deletes files on "foreign" <branch> before merging.

Useful for ignoring a folder in <branch> before merging it with current branch. Works by
deleting FILE(S) in a detached commit based on <branch>, and then performing the merge of
this new commit in the current branch. Note that <branch> is not changed by this
procedure. Also note that <branch> may actually be any reference, like a tag, or a remote
branch, or even a commit SHA.

For more information, see <http://stackoverflow.com/questions/3111515>

OPTIONS


-h, --help
show help message and exit

-v, --verbose
do not use -q to supress normal output of internal steps from git checkout, rm,
commit. By default, only git merge output is shown. Errors, however, are never
supressed.

-M <message>, --msgcommit=<message>
message for the removal commit in <branch>. Not to be confused with the message of
the merge commit, which is set by -m. Default message is: "remove files from
'<branch>' before merge".

-m <message>, --message=<message>
message for the merge commit. Since we are not merging <branch> directly, but
rather a detached commit based on it, we forge a message similar to git's default
for a branch merge. Otherwise git would use in message the full and ugly SHA1 of
our commit. Default message is: "Merge stripped branch '<branch>'".

For both commit messages, the token "<branch>" is replaced for the actual <branch> name.

Additional options are passed unchecked to git merge.

All options must precede <branch> and FILE(s), except -h and --help that may appear
anywhere on the command line.

EXAMPLE


git-strip-merge design "photoshop/*"

Use git-strip-merge online using onworks.net services


Free Servers & Workstations

Download Windows & Linux apps

  • 1
    deep-clean
    deep-clean
    A Kotlin script that nukes all build
    caches from Gradle/Android projects.
    Useful when Gradle or the IDE let you
    down. The script has been tested on
    macOS, but ...
    Download deep-clean
  • 2
    Eclipse Checkstyle Plug-in
    Eclipse Checkstyle Plug-in
    The Eclipse Checkstyle plug-in
    integrates the Checkstyle Java code
    auditor into the Eclipse IDE. The
    plug-in provides real-time feedback to
    the user about viol...
    Download Eclipse Checkstyle Plug-in
  • 3
    AstrOrzPlayer
    AstrOrzPlayer
    AstrOrz Player is a free media player
    software, part based on WMP and VLC. The
    player is in a minimalist style, with
    more than ten theme colors, and can also
    b...
    Download AstrOrzPlayer
  • 4
    movistartv
    movistartv
    Kodi Movistar+ TV es un ADDON para XBMC/
    Kodi que permite disponer de un
    decodificador de los servicios IPTV de
    Movistar integrado en uno de los
    mediacenters ma...
    Download movistartv
  • 5
    Code::Blocks
    Code::Blocks
    Code::Blocks is a free, open-source,
    cross-platform C, C++ and Fortran IDE
    built to meet the most demanding needs
    of its users. It is designed to be very
    extens...
    Download Code::Blocks
  • 6
    Amidst
    Amidst
    Amidst or Advanced Minecraft Interface
    and Data/Structure Tracking is a tool to
    display an overview of a Minecraft
    world, without actually creating it. It
    can ...
    Download Amidst
  • More »

Linux commands

Ad