Re: [tei-council] git help

Also a simple way to check which files have been changed and not yet committed in your branch is git status To see the changes themselves use git diff On Nov 19, 2016 4:01 PM, "Elisa Beshero-Bondar" wrote:

Syd--Wait a second…This might be a better solution, on how to select particular files from one branch to merge into another branch: http://jasonrudolph.com/blog/2009/02/25/git-tip-how-to- merge-specific-files-from-another-branch/ <http://jasonrudolph.com/blog/ 2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/>

Seems simpler! Let us know what works..! Elisa (fascinated with git)

...

On Nov 19, 2016, at 3:52 PM, Elisa Beshero-Bondar wrote:

…And on merging just one file into dev, here’s something to look at:

http://stackoverflow.com/questions/10784523/how-do-i- merge-changes-to-a-single-file-rather-than-merging- commits/11593308#11593308 <http://stackoverflow.com/ questions/10784523/how-do-i-merge-changes-to-a-single- file-rather-than-merging-commits/11593308#11593308>

Following the advice here, you’d checkout the dev branch, and apply a patch from your sydb-occurs branch to just one of the files there… Elisa

...

On Nov 19, 2016, at 3:43 PM, Elisa Beshero-Bondar mailto:ebbondar@gmail.com> wrote:

Hi Syd— On Stack Overflow I discover this, which might help: git diff --name-only <some-other-branch> will show you what files are different between your current branch and <some-other-branch>

Here’s the post: http://stackoverflow.com/questions/10641361/git-get- all-files-that-have-been-modified-in-branch <http://stackoverflow.com/ questions/10641361/git-get-all-files-that-have-been-modified-in-branch>

Does that work? Elisa -- Elisa Beshero-Bondar, PhD Director, Center for the Digital Text | Associate Professor of English University of Pittsburgh at Greensburg | Humanities Division 150 Finoli Drive Greensburg, PA 15601 USA E-mail: ebb8@pitt.edu mailto:ebb8@pitt.edu Development site: http://newtfire.org http://newtfire.org/

...

On Nov 19, 2016, at 2:57 PM, Syd Bauman mailto:s.bauman@northeastern.edu> wrote:

OK. One file from sydb-occurs (odds/odd2odd.xsl) is ready to be merged into dev.

But I don't remember what other changes I've made to sydb-occurs, and even if I did, I know they are not ready to be merged into dev. So two questions:

1) Any way to (easily) ask git which files have been changed in the sydb-occurs branch since it was created? I.e., at least the equivalent of the -v switch on `svn log`.

2) Can I merge just that one file into dev, and if so, how?

Thanks. -- tei-council mailing list tei-council@lists.tei-c.org mailto:tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council < http://lists.lists.tei-c.org/mailman/listinfo/tei-council>

PLEASE NOTE: postings to this list are publicly archived

-- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

PLEASE NOTE: postings to this list are publicly archived