Differences between revisions 3 and 15 (spanning 12 versions)
⇤ ← Revision 3 as of 2007-06-10 17:32:20 →
Size: 340
Editor: S01060016b6db031a
Comment: git-rerere todo item
← Revision 15 as of 2007-08-08 03:04:16 → ⇥
Size: 260
Editor: 220
Comment:
Deletions are marked like this. Additions are marked like this.
Line 3: Line 3:
 * LocalBranches  * LocalBranch
Line 10: Line 10:
 * automatic resolution of previously handled merge conflicts, cf git-rerere

Projects:

Todo:

  • Mq: add a qrebase command to wrap qsave -e c; qpush -a -m
  • Transplant: Support merge transplants. Use original second parent?
  • Hunk selection (waiting on mpatch merge)

BrendanCully (last edited 2012-11-06 08:56:23 by mpm)