1GIT-STRIP-MERGE(1)          General Commands Manual         GIT-STRIP-MERGE(1)
2
3
4

NAME

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

SYNOPSIS

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

DESCRIPTION

13       git-merge that deletes files on "foreign" <branch> before merging.
14
15       Useful for ignoring a folder in <branch> before merging it with current
16       branch. Works by deleting FILE(S) in a detached commit based on
17       <branch>, and then performing the merge of this new commit in the
18       current branch. Note that <branch> is not changed by this procedure.
19       Also note that <branch> may actually be any reference, like a tag, or a
20       remote branch, or even a commit SHA.
21
22       For more information, see <http://stackoverflow.com/questions/3111515>
23

OPTIONS

25       -h, --help
26               show help message and exit
27
28       -v, --verbose
29               do not use -q to suppress normal output of internal steps from
30               git checkout, rm, commit. By default, only git merge output is
31               shown.  Errors, however, are never suppressed.
32
33       -M <message>, --msgcommit=<message>
34               message for the removal commit in <branch>. Not to be confused
35               with the message of the merge commit, which is set by -m.
36               Default message is: "remove files from '<branch>' before
37               merge".
38
39       -m <message>, --message=<message>
40               message for the merge commit. Since we are not merging <branch>
41               directly, but rather a detached commit based on it, we forge a
42               message similar to git's default for a branch merge. Otherwise
43               git would use in message the full and ugly SHA1 of our commit.
44               Default message is: "Merge stripped branch '<branch>'".
45
46       For both commit messages, the token "<branch>" is replaced for the
47       actual <branch> name.
48
49       Additional options are passed unchecked to git merge.
50
51       All options must precede <branch> and FILE(s), except -h and --help
52       that may appear anywhere on the command line.
53

EXAMPLE

55       git-strip-merge design "photoshop/*"
56

SEE ALSO

58       https://github.com/MestreLion/git-tools
59

AUTHOR

61       Rodrigo Silva (MestreLion) linux@rodrigosilva.com
62
63
64
65                                  2016-01-31                GIT-STRIP-MERGE(1)