Skip to content
Snippets Groups Projects
  1. Oct 11, 2011
  2. Oct 09, 2011
  3. Sep 19, 2011
  4. Jul 21, 2011
  5. Jul 18, 2011
  6. Jul 15, 2011
  7. Jun 08, 2011
  8. Jun 12, 2011
  9. Jun 13, 2011
  10. Jun 01, 2011
  11. Mar 26, 2011
  12. May 27, 2011
  13. May 12, 2011
  14. May 10, 2011
  15. Apr 05, 2011
  16. Mar 27, 2011
  17. Apr 05, 2011
  18. Apr 04, 2011
  19. Apr 02, 2011
  20. Mar 27, 2011
  21. Mar 26, 2011
  22. Mar 23, 2011
    • Stefano Tortarolo's avatar
      rebase: allow for rebasing descendants onto ancestors on different named branches · 4e2690a7
      Stefano Tortarolo authored
      So far we've been denying rebasing descendants onto ancestors, but there are
      situations in which this kind of operation makes perfect sense to me.
      
      Let's say we have made a commit (or more), that belongs to branch 'dev', on
      top of the named branch 'stable':
      
      ... a (stable) - b (dev)
      
      but then we realize that b should belong to branch 'stable'.
      In these cases a rebase means: "move these csets from named branch A to named
      branch B" and there isn't a valid reason to deny it.
      
      This patch basically doesn't block it, if source and destination are
      on different named branches.
      The old behaviour still applies for rebases across the same named branch.
      
      Can you think of any tricky corner cases in which this new behaviour could
      lead to problems? (I bet there are tons of them...)
      
      By the way, I created a brand new .t because I feel there should be more
      tests I can't think of at the moment.
      4e2690a7
  23. Mar 15, 2011
    • Radomir Dopieralski's avatar
      rebase: add -m/--message to rebase --collapse (issue2389) · ee349e22
      Radomir Dopieralski authored
      When collapsing changesets with rebase, you get a chance to edit the commit
      message manually, but there is no way to pass this message from the command
      line. This patch adds a `--message` (with short form `-m`) and `--logfile`
      (with short form `-m`) options to the rebase command. These options suppresses
      the generation of the default commit message, and instead use the message
      provided in the option (in case of `-m`) or in the file it points to (in case
      of `-l`).
      
      If you use this option without the `--collapse` option, it will raise an
      error.
      
      Options documentation edited by Patrick Mezard <pmezard@gmail.com>
      ee349e22
  24. Mar 13, 2011
  25. Jan 02, 2011
  26. Nov 20, 2010
  27. Oct 30, 2010
  28. Oct 26, 2010
  29. Jul 20, 2010
  30. Aug 27, 2010
  31. Aug 14, 2010
  32. Aug 13, 2010
  33. Aug 07, 2010
  34. Jul 20, 2010
  35. Jul 13, 2010
  36. Jul 12, 2010
  37. Jul 13, 2010
Loading