summaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2010-08-09 15:14:08 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2011-02-01 16:23:45 +0100
commitc139cc05d3101187d7292e220b1734bb03be99da (patch)
treeb17587f22b22647134ab3143498e47bd70a5cdc4 /AUTHORS
parentaa4ed2b47671786c2d651e2f0604fd18f7ab74a6 (diff)
downloadfedora-packager-c139cc05d3101187d7292e220b1734bb03be99da.tar.gz
fedora-packager-c139cc05d3101187d7292e220b1734bb03be99da.tar.xz
fedora-packager-c139cc05d3101187d7292e220b1734bb03be99da.zip
Add "fedpkg initial-merge" command
usage: fedpkg.py initial-merge [-h] [-n] [repo-path [repo-path ...]] Performs a 'git merge' of all git branches with the same content (i.e. with the same package spec files, patch files, etc.), regardless of their history. This is useful after Fedora's dist-cvs to dist-git migration, as often different branches have different histories but the same content on the filesystem. After these initial merges of identical trees, future merges between the branches will be a lot easier: Easier to follow in the dependency graph, and easier to perform without conflicts. positional arguments: repo-path Path to a repo to initial-merge optional arguments: -h, --help show this help message and exit -n, --dry-run Whether to run without actually merging
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions