Databases
StackOverflow2013
Postsdbo
POExtract out changes to single file in a range of git commits
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POExtract out changes to single file in a range of git commits
    primarykey
    data
    text
    <p>The build system I work with usually requires that the project data is committed to the local repository before a full build can be performed. This -- along with my usual habit of committing frequently and rebasing before pushing to the public repo -- means I usually have a stack of commits on top of the remote head. Most of them have commit messages like "s" because I know they will be squashed.</p> <p>The situation I have here is automating one of the steps of rebasing the list of commits. I know that all the changes I make to a certain file should not be pushed to the public repo, and I was looking for a way to edit each commit to split off the changes to that file into separate commits which I will squash in a later rebase.</p> <p>For example, here's the commits I have on top if the origin's HEAD:</p> <pre><code>* 6f42745 (HEAD, master-dave) s * b33bc68 s * 0b787e8 s * 3d47e9e s * ae45dec brought pkg up-to-date with master branch * dd87ec1 s * 96fd4ef DD: dave dev * 422cf73 (origin/master, master) Add missing build scripts. </code></pre> <p>I want to iterate through all commits from master..master-dave, extract changes to ./file.txt, giving me:</p> <pre><code>* 6f42745 (HEAD, master-dave) s * ------- DD (changes to file.txt) * b33bc68 s * ------- DD (changes to file.txt) * 0b787e8 s * ------- DD (changes to file.txt) * 3d47e9e s * ae45dec brought pkg up-to-date with master branch * dd87ec1 s * 96fd4ef DD: dave dev * 422cf73 (origin/master, master) Add missing build scripts. </code></pre> <p>And finally, I would run git rebase -i origin/master, squash all the "DD" commits together, all the "s" commits into "brought pkg up-to-date with master branch", re-order them, update master, and push to origin, finally ending up with:</p> <pre><code>* ------- (HEAD, master-dave) DD: dave dev * ------- (origin/master, master) brought pkg up-to-date with master branch * 422cf73 Add missing build scripts. </code></pre> <p>I'm pretty sure the answer lies with git filter-branch, but I can't figure out how.</p> <hr> <p>EDIT:</p> <ul> <li>--autosquash fixes the annoyance of the "s" commits, but that's not the main question. I still don't know how to split out the changes to a specific file, which must happen <em>before</em> I squash them.</li> <li>smudge/clean filters are nifty, but I'm not doing keyword replacement, and I don't think the changes I want to maintain on my personal branch are going to be predictable enough to script. I think I'm always going to have to be at least one commit ahead of the public master.</li> </ul>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USDavid Dombrowsky
    1. USDavid Dombrowsky
    plurals
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POExtract out changes to single file in a range of git commits
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POExtract out changes to single file in a range of git commits
      1. This table or related slice is empty.
      1. VTUpMod
    1. COfilter-branch? I would rather have a filter driver (http://stackoverflow.com/questions/2673232/how-do-you-tell-git-to-permanently-ignore-changes-in-a-file/2673285#2673285) and use some `--autosquash` (http://stackoverflow.com/questions/2302736/trimming-git-checkins-squashing-git-history/2302947#2302947)
      singulars
      1. POExtract out changes to single file in a range of git commits
      1. USVonC
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload