Skip to content
Snippets Groups Projects
  1. Aug 07, 2010
  2. Jul 20, 2010
  3. Jul 13, 2010
  4. Jul 12, 2010
  5. Jul 13, 2010
  6. Jun 06, 2010
    • Katsunori FUJIWARA's avatar
      help: show value requirement and multiple occurrence of options · 40c06bbf
      Katsunori FUJIWARA authored
      this helps users to know what kind of option is:
      
        - no value is required(flag option)
        - value is required
        - value is required, and multiple occurrences are allowed
      
      each kinds are shown as below:
      
       -f --force              force push
       -e --ssh CMD            specify ssh command to use
       -b --branch BRANCH [+]  a specific branch you would like to push
      
      if one or more 3rd type options are shown, explanation for '[+]' mark
      is also shown as footnote.
      40c06bbf
  7. Jun 08, 2010
  8. Jun 04, 2010
  9. May 20, 2010
  10. May 17, 2010
  11. Mar 23, 2010
  12. Mar 13, 2010
  13. Feb 07, 2010
  14. Mar 13, 2010
  15. Mar 02, 2010
  16. Mar 11, 2010
  17. Mar 10, 2010
    • Greg Ward's avatar
      rebase: improve help text · 86dc2114
      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
      86dc2114
    • Greg Ward's avatar
      rebase: improve help text · 23ab3b05
      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
      23ab3b05
    • Sune Foldager's avatar
  18. Feb 12, 2010
  19. Feb 09, 2010
  20. Feb 06, 2010
    • Stefano Tortarolo's avatar
      rebase: add --detach option to detach intermediate revisions (issue1950) · 66d954e7
      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.
      66d954e7
  21. Jan 31, 2010
    • Stefano Tortarolo's avatar
      rebase: refactoring · 38fe86fb
      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'.
      38fe86fb
  22. Jan 20, 2010
  23. Nov 09, 2009
    • Christian Boos's avatar
      rebase: make sure the newancestor is used during the whole update · 49efeed4
      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.
      49efeed4
  24. Oct 15, 2009
  25. Oct 14, 2009
  26. Oct 08, 2009
  27. Sep 18, 2009
  28. Aug 02, 2009
  29. Jul 25, 2009
  30. Jul 22, 2009
Loading