EnglishFrenchSpanish

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
    Alt-F
    Alt-F
    Alt-F provides a free and open source
    alternative firmware for the DLINK
    DNS-320/320L/321/323/325/327L and
    DNR-322L. Alt-F has Samba and NFS;
    supports ext2/3/4...
    Download Alt-F
  • 2
    usm
    usm
    Usm is a unified slackware package
    manager that handles automatic
    dependency resolution. It unifies
    various package repositories including
    slackware, slacky, p...
    Download usm
  • 3
    Chart.js
    Chart.js
    Chart.js is a Javascript library that
    allows designers and developers to draw
    all kinds of charts using the HTML5
    canvas element. Chart js offers a great
    array ...
    Download Chart.js
  • 4
    iReport-Designer for JasperReports
    iReport-Designer for JasperReports
    NOTE: iReport/Jaspersoft Studio Support
    Announcement: As of version 5.5.0,
    Jaspersoft Studio will be the official
    design client for JasperReports. iReport
    will...
    Download iReport-Designer for JasperReports
  • 5
    PostInstallerF
    PostInstallerF
    PostInstallerF will install all the
    software that Fedora Linux and others
    doesn't include by default, after
    running Fedora for the first time. Its
    easy for...
    Download PostInstallerF
  • 6
    strace
    strace
    The strace project has been moved to
    https://strace.io. strace is a
    diagnostic, debugging and instructional
    userspace tracer for Linux. It is used
    to monitor a...
    Download strace
  • More »

Linux commands

  • 1
    aclocal-15
    aclocal-15
    aclocal - manual page for aclocal 1.15 ...
    Run aclocal-15
  • 2
    AClock
    AClock
    AClock - Analog dockapp clock for
    GNUstep ...
    Run AClock
  • 3
    crashstats
    crashstats
    crashstats - Display CrashMail
    statistics ...
    Run crashstats
  • 4
    crashwrite
    crashwrite
    crashwrite - Creates PKT file from text
    file ...
    Run crashwrite
  • 5
    gap.real
    gap.real
    GAP - Groups, Algorithms and
    Programming DESCRIPTION: GAP is a system
    for computational discrete algebra with
    particular emphasis on computational
    group theory...
    Run gap.real
  • 6
    gap.sh
    gap.sh
    GAP - Groups, Algorithms and
    Programming DESCRIPTION: GAP is a system
    for computational discrete algebra with
    particular emphasis on computational
    group theory...
    Run gap.sh
  • More »

Ad