diff options
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 7b590268ed..656869101a 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -7,7 +7,6 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commi SUBDIRECTORY_OK=Yes . git-sh-setup -set_reflog_action "merge $*" require_work_tree cd_to_toplevel @@ -217,6 +216,7 @@ head=$(git-rev-parse --verify "$head_arg"^0) || usage # All the rest are remote heads test "$#" = 0 && usage ;# we need at least one remote head. +set_reflog_action "merge $*" remoteheads= for remote |