Skip to content
Snippets Groups Projects
  1. Apr 02, 2011
  2. Mar 27, 2011
  3. Mar 26, 2011
  4. 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
  5. 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
  6. Mar 13, 2011
  7. Jan 02, 2011
  8. Nov 20, 2010
  9. Oct 30, 2010
  10. Oct 26, 2010
  11. Jul 20, 2010
  12. Aug 27, 2010
  13. Aug 14, 2010
  14. Aug 13, 2010
  15. Aug 07, 2010
  16. Jul 20, 2010
  17. Jul 13, 2010
  18. Jul 12, 2010
  19. Jul 13, 2010
  20. 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
  21. Jun 08, 2010
  22. Jun 04, 2010
  23. May 20, 2010
  24. May 17, 2010
  25. Mar 23, 2010
  26. Mar 13, 2010
  27. Feb 07, 2010
  28. Mar 13, 2010
  29. Mar 02, 2010
  30. Mar 11, 2010
  31. 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
Loading