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
    LMMS Digital Audio Workstation
    LMMS Digital Audio Workstation
    LMMS is a free cross-platform software
    which allows you to produce music with
    your computer. If you like this project
    consider getting involved in the project
    h...
    Download LMMS Digital Audio Workstation
  • 2
    FreeRTOS Real Time Kernel (RTOS)
    FreeRTOS Real Time Kernel (RTOS)
    FreeRTOS is a market-leading real-time
    operating system (RTOS) for
    microcontrollers and small
    microprocessors. Distributed freely
    under the MIT open source lice...
    Download FreeRTOS Real Time Kernel (RTOS)
  • 3
    Avogadro
    Avogadro
    Avogadro is an advanced molecular
    editor designed for cross-platform use
    in computational chemistry, molecular
    modeling, bioinformatics, materials
    science and ...
    Download Avogadro
  • 4
    XMLTV
    XMLTV
    XMLTV is a set of programs to process
    TV (tvguide) listings and help manage
    your TV viewing, storing listings in an
    XML-based format. There are utilities to
    do...
    Download XMLTV
  • 5
    strikr
    strikr
    Strikr Free Software project. Artifacts
    released under a 'intent based'
    dual license: AGPLv3 (community) and
    CC-BY-NC-ND 4.0 international
    (commercial)...
    Download strikr
  • 7
    GIFLIB
    GIFLIB
    giflib is a library for reading and
    writing gif images. It is API and ABI
    compatible with libungif which was in
    wide use while the LZW compression
    algorithm was...
    Download GIFLIB
  • More »

Linux commands

Ad