File: git-merge-repo.md

package info (click to toggle)
git-extras 7.4.0-1
  • links: PTS
  • area: main
  • in suites: forky, sid
  • size: 2,120 kB
  • sloc: sh: 4,312; python: 994; makefile: 146
file content (34 lines) | stat: -rw-r--r-- 850 bytes parent folder | download | duplicates (6)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
git-merge-repo(1) -- Merge two repo histories
=============================================

## SYNOPSIS

`git-merge-repo` <repo> <branch> <directory> [--squash]

## DESCRIPTION

Merges a repository's history with the current repository, inside a specified directory.

Optional `--squash` flag skips the full history and generates only one commit for the merge.

## EXAMPLES

  Merges a local repo's `frontend` branch into the current repo's `web` folder:

    $ git merge-repo ../app/.git frontend web

  Merges a remote repo's `master` branch into the current repo's folder:

    $ git merge-repo git@github.com:tj/git-extras.git master .

## AUTHOR

Written by Ivan Malopinsky &lt;<hello@imsky.co>&gt;

## REPORTING BUGS

&lt;<https://github.com/tj/git-extras/issues>&gt;

## SEE ALSO

&lt;<https://github.com/tj/git-extras>&gt;