1. 20 Mar, 2018 1 commit
    • Jérome Perrin's avatar
      tools: a simple git.mergetool for working with buildout.hash.cfg · 6dbd5cca
      Jérome Perrin authored
      Rewriting commit history with `git rebase -i` always caused some
      conflicts on md5sum of modified files. `update-hash` made all this
      easier, because we could just revert buildout.hash.cfg, re-run
      `update-hash` and commit the changes.
      
      This tool makes this scenario a bit more user friendly by automating the
      steps by running as a git mergetool.
      
      An interactive rebase session can be initiated by running this command
      from software/*/ directory:
      
      `git rebase -i --exec "$(pwd)/../../update-hash $(pwd)/buildout.hash.cfg" origin/master`
      
      and if conflict occur, run:
      
      `git mergetool --tool update-hash-mergetool && EDITOR=cat git rebase --continue`
      
      This way, rebase session can be almost non interactive (still have to
      run the above mergetool command) when conflicts are only on md5sum
      updates.
      
      /reviewed-on !273
      6dbd5cca
  2. 19 Mar, 2018 3 commits
  3. 16 Mar, 2018 9 commits
  4. 15 Mar, 2018 5 commits
  5. 14 Mar, 2018 4 commits
  6. 13 Mar, 2018 6 commits
  7. 12 Mar, 2018 3 commits
  8. 08 Mar, 2018 2 commits
  9. 07 Mar, 2018 1 commit
  10. 06 Mar, 2018 2 commits
  11. 05 Mar, 2018 4 commits