Skip to content
Permalink
Browse files

Merge pull request #1814 from dscho/builtin-stash-v8

Update the built-in stash to v8, and the built-in rebase -i to v7
  • Loading branch information...
jamill committed Sep 4, 2018
2 parents c71186e + 12b5a71 commit eb29dc6604c8bb0fa955b7e3f28d1fc7ed103552
Showing with 409 additions and 320 deletions.
  1. +0 −3 Documentation/git-stash.txt
  2. +6 −0 builtin/rebase--interactive.c
  3. +306 −305 builtin/stash.c
  4. +5 −3 sequencer.c
  5. +11 −9 t/t3903-stash.sh
  6. +81 −0 t/t3907-stash-show-config.sh
@@ -117,9 +117,6 @@ show [<options>] [<stash>]::
You can use stash.showStat and/or stash.showPatch config variables
to change the default behavior.

It accepts any option known to `git diff`, but acts different on
`--quiet` option and exit with zero regardless of differences.

pop [--index] [-q|--quiet] [<stash>]::

Remove a single stashed state from the stash list and apply it
@@ -206,6 +206,9 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
opts.allow_ff = 1;
opts.allow_empty = 1;

if (argc == 1)
usage_with_options(builtin_rebase_interactive_usage, options);

argc = parse_options(argc, argv, NULL, options,
builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);

@@ -223,6 +226,9 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)

switch (command) {
case NONE:
if (!onto && !upstream)
die(_("a base commit must be provided with --upstream or --onto"));

ret = do_interactive_rebase(&opts, flags, switch_to, upstream, onto,
onto_name, squash_onto, head_name, restrict_revision,
raw_strategies, cmd, autosquash);

0 comments on commit eb29dc6

Please sign in to comment.
You can’t perform that action at this time.