Skribent: Isaac Dunham Dato: Til: Jaromil CC: dng Emne: Re: [Dng] Towards systemd-free packages
On Thu, Feb 12, 2015 at 09:27:10AM +0000, Jaromil wrote: > its sort of ready now, but as "I'm eating my own dogfood" (tm) I already
> notice the staging workflow can be made better by creating different git
> repositories for new versions of the same source, rather than different
> branches. This because one can simply copy files between different repos
> if they need to be merged, while with the branch approach the unit for
> merging are commits and to have files out of them the commits must be
> rebased and split (rather painful).
You can use:
$ git checkout <tree-ish> -- <file1> ...
(tree-ish can be a branch name, hash, tag, or any other reference form
git understands).
With the version of git in Jessie, this will checkout the files specified
and add them to the stage.