Andrew's git / gitweb.git /
263987c55db053b3cb5455704b5206f272599fb8
   1#!/bin/sh
   2#
   3# Copyright (c) 2010 Junio C Hamano.
   4#
   5
   6. git-sh-setup
   7
   8case "$action" in
   9continue)
  10        git am --resolved --3way --resolvemsg="$resolvemsg" &&
  11        move_to_original_branch
  12        exit
  13        ;;
  14skip)
  15        git am --skip -3 --resolvemsg="$resolvemsg" &&
  16        move_to_original_branch
  17        exit
  18        ;;
  19esac
  20
  21test -n "$rebase_root" && root_flag=--root
  22
  23git format-patch -k --stdout --full-index --ignore-if-in-upstream \
  24        --src-prefix=a/ --dst-prefix=b/ \
  25        --no-renames $root_flag "$revisions" |
  26git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" &&
  27move_to_original_branch
  28ret=$?
  29test 0 != $ret -a -d "$state_dir" &&
  30        echo $head_name > "$state_dir/head-name" &&
  31        echo $onto > "$state_dir/onto" &&
  32        echo $orig_head > "$state_dir/orig-head" &&
  33        echo "$GIT_QUIET" > "$state_dir/quiet"
  34exit $ret