Skip to content
Snippets Groups Projects
  1. Jun 08, 2010
  2. Jun 04, 2010
  3. May 20, 2010
  4. May 17, 2010
  5. Mar 23, 2010
  6. Mar 13, 2010
  7. Feb 07, 2010
  8. Mar 13, 2010
  9. Mar 02, 2010
  10. Mar 11, 2010
  11. Mar 10, 2010
    • Greg Ward's avatar
      rebase: improve help text · 86dc21148bdb
      Greg Ward authored
      - add a paragraph about default dest/source changesets
      - option help: say "changeset" not "revision"
      - option help: explain -b/--base better
      - clarify that -a/--abort and -c/--continue are different from the
        other options
      86dc21148bdb
    • Greg Ward's avatar
      rebase: improve help text · 23ab3b05bd66
      Greg Ward authored
      - add a paragraph about default dest/source changesets
      - option help: say "changeset" not "revision"
      - option help: explain -b/--base better
      - clarify that -a/--abort and -c/--continue are different from the
        other options
      23ab3b05bd66
    • Sune Foldager's avatar
      6227c8d669d5
  12. Feb 12, 2010
  13. Feb 09, 2010
  14. Feb 06, 2010
    • Stefano Tortarolo's avatar
      rebase: add --detach option to detach intermediate revisions (issue1950) · 66d954e76ffb
      Stefano Tortarolo authored
      When rebasing an intermediate revision, rebase keeps a parent relationship
      with the original parent. This option forces the removal of this relationship.
      In more depth, it 'fakes' null merges between the target revision and the
      ancestors of source, dropping every change from the ancestors.
      The result is that every change in source and its descendants will be rebased,
      ignoring the changes in its ancestors.
      66d954e76ffb
  15. Jan 31, 2010
    • Stefano Tortarolo's avatar
      rebase: refactoring · 38fe86fb16e3
      Stefano Tortarolo authored
      Separate rebase-specific functions, in order to provide a better base to
      extend rebase's capabilities.
      
      Note that this will be useful especially to share functions with 'adapt'.
      38fe86fb16e3
  16. Jan 20, 2010
  17. Nov 09, 2009
    • Christian Boos's avatar
      rebase: make sure the newancestor is used during the whole update · 49efeed49c94
      Christian Boos authored
      (issue1561)
      
      Before this change, newancestor was used only once as a replacement
      for ancestor.ancestor, but merge.update calls ancestor.ancestor
      several times, so it ends up with the "wrong" ancestor (the real
      ancestor, but we want the parent of the rebased changeset for all but
      the first rebased changeset).
      
      Added a new test case for this: test-rebase-newancestor.
      
      Also, in one scenario in test-rebase-collapse, there was a spurious
      conflict caused by the same issue, so that test case was fixed by
      removing the now unneeded conflict resolution and the output was
      adapted accordingly.
      49efeed49c94
  18. Oct 15, 2009
  19. Oct 14, 2009
  20. Oct 08, 2009
  21. Sep 18, 2009
  22. Aug 02, 2009
  23. Jul 25, 2009
  24. Jul 22, 2009
    • Martin Geisler's avatar
      merge with crew-stable · 07d127e771a1
      Martin Geisler authored
      07d127e771a1
    • Martin Geisler's avatar
      do not translate commit messages · d0225fa2f6c4
      Martin Geisler authored
      It is not very helpful to have 'Added tag %s for changeset %s' and
      similar messages translated into different languages when people work
      together using different locales.
      
      We now use English strings without support for translations. If
      needed, the user can still supply a custom string for most commands.
      d0225fa2f6c4
  25. Jul 07, 2009
  26. Jun 24, 2009
  27. Jun 01, 2009
Loading