3 # Copyright (c) 2005 Junio C Hamano
8 git merge [options] <remote>...
9 git merge [options] <msg> HEAD <remote>
11 stat show a diffstat at the end of the merge
12 n don't show a diffstat at the end of the merge
13 summary (synonym to --stat)
14 log add list of one-line log to merge commit message
15 squash create a single commit instead of doing a merge
16 commit perform a commit if the merge succeeds (default)
17 ff allow fast-forward (default)
18 s,strategy= merge strategy to use
19 m,message= message to be used for the merge commit (if any)
27 test -z "$(git ls-files -u)" ||
28 die
"Merge is not possible because you have unmerged files."
33 all_strategies
='recur recursive octopus resolve stupid ours subtree'
34 all_strategies
="$all_strategies recursive-ours recursive-theirs"
35 default_twohead_strategies
='recursive'
36 default_octopus_strategies
='octopus'
37 no_fast_forward_strategies
='subtree ours'
38 no_trivial_strategies
='recursive recur subtree ours recursive-ours recursive-theirs'
43 squash
= no_commit
= log_arg
=
46 rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
47 "$GIT_DIR/MERGE_STASH" ||
exit 1
51 # Stash away any local modifications.
52 git stash create
>"$GIT_DIR/MERGE_STASH"
56 if test -f "$GIT_DIR/MERGE_STASH"
58 git
reset --hard $head >/dev
/null
59 git stash apply $
(cat "$GIT_DIR/MERGE_STASH")
60 git update-index
--refresh >/dev
/null
64 finish_up_to_date
() {
67 echo "$1 (nothing to squash)" ;;
75 echo Squashed commit of the following
:
77 git log
--no-merges --pretty=medium ^
"$head" $remoteheads
83 rlogm
="$GIT_REFLOG_ACTION"
86 rlogm
="$GIT_REFLOG_ACTION: $2"
90 echo "Squash commit -- not updating HEAD"
91 squash_message
>"$GIT_DIR/SQUASH_MSG"
96 echo "No merge message -- not updating HEAD"
99 git update-ref
-m "$rlogm" HEAD
"$1" "$head" ||
exit 1
109 if test "$show_diffstat" = t
111 # We want color (if set), but no pager
112 GIT_PAGER
='' git
diff --stat --summary -M "$head" "$1"
117 # Run a post-merge hook
118 if test -x "$GIT_DIR"/hooks
/post-merge
122 "$GIT_DIR"/hooks
/post-merge
1
125 "$GIT_DIR"/hooks
/post-merge
0
133 rh
=$
(git rev-parse
--verify "$remote^0" 2>/dev
/null
) ||
return
134 bh
=$
(git show-ref
-s --verify "refs/heads/$remote" 2>/dev
/null
)
135 if test "$rh" = "$bh"
137 echo "$rh branch '$remote' of ."
138 elif truname
=$
(expr "$remote" : '\(.*\)~[1-9][0-9]*$') &&
139 git show-ref
-q --verify "refs/heads/$truname" 2>/dev
/null
141 echo "$rh branch '$truname' (early part) of ."
142 elif test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD"
144 sed -e 's/ not-for-merge / /' -e 1q \
145 "$GIT_DIR/FETCH_HEAD"
147 echo "$rh commit '$remote'"
152 while test $# != 0; do
154 -n|
--no-stat|
--no-summary)
155 show_diffstat
=false
;;
161 test "$allow_fast_forward" = t ||
162 die
"You cannot combine --squash with --no-ff."
163 squash
=t no_commit
=t
;;
165 squash
= no_commit
= ;;
171 allow_fast_forward
=t
;;
173 test "$squash" != t ||
174 die
"You cannot combine --squash with --no-ff."
175 allow_fast_forward
=f
;;
178 case " $all_strategies " in
180 use_strategies
="$use_strategies$1 " ;;
182 die
"available strategies are: $all_strategies" ;;
200 test $# != 0 || usage
204 if branch
=$
(git-symbolic-ref
-q HEAD
)
206 mergeopts
=$
(git config
"branch.${branch#refs/heads/}.mergeoptions")
207 if test -n "$mergeopts"
209 parse_config
$mergeopts --
214 while test $args_left -lt $#; do shift; done
216 if test -z "$show_diffstat"; then
217 test "$(git config --bool merge.diffstat)" = false
&& show_diffstat
=false
218 test "$(git config --bool merge.stat)" = false
&& show_diffstat
=false
219 test -z "$show_diffstat" && show_diffstat
=t
222 # This could be traditional "merge <msg> HEAD <commit>..." and the
223 # way we can tell it is to see if the second token is HEAD, but some
224 # people might have misused the interface and used a committish that
225 # is the same as HEAD there instead. Traditional format never would
226 # have "-m" so it is an additional safety measure to check for it.
228 if test -z "$have_message" &&
229 second_token
=$
(git rev-parse
--verify "$2^0" 2>/dev
/null
) &&
230 head_commit
=$
(git rev-parse
--verify "HEAD" 2>/dev
/null
) &&
231 test "$second_token" = "$head_commit"
237 elif ! git rev-parse
--verify HEAD
>/dev
/null
2>&1
239 # If the merged head is a valid one there is no reason to
240 # forbid "git merge" into a branch yet to be born. We do
241 # the same for "git pull".
244 echo >&2 "Can merge only exactly one commit into empty head"
248 test "$squash" != t ||
249 die
"Squash commit into empty head not supported yet"
250 test "$allow_fast_forward" = t ||
251 die
"Non-fast-forward into an empty head does not make sense"
252 rh
=$
(git rev-parse
--verify "$1^0") ||
253 die
"$1 - not something we can merge"
255 git update-ref
-m "initial pull" HEAD
"$rh" "" &&
256 git read-tree
--reset -u HEAD
260 # We are invoked directly as the first-class UI.
263 # All the rest are the commits being merged; prepare
264 # the standard merge summary message to be appended to
265 # the given message. If remote is invalid we will die
266 # later in the common codepath so we discard the error
268 merge_name
=$
(for remote
271 done | git fmt-merge-msg
$log_arg
273 merge_msg
="${merge_msg:+$merge_msg$LF$LF}$merge_name"
275 head=$
(git rev-parse
--verify "$head_arg"^
0) || usage
277 # All the rest are remote heads
278 test "$#" = 0 && usage
;# we need at least one remote head.
279 set_reflog_action
"merge $*"
284 remotehead
=$
(git rev-parse
--verify "$remote"^
0 2>/dev
/null
) ||
285 die
"$remote - not something we can merge"
286 remoteheads
="${remoteheads}$remotehead "
287 eval GITHEAD_
$remotehead='"$remote"'
288 export GITHEAD_
$remotehead
290 set x
$remoteheads ; shift
292 case "$use_strategies" in
296 var
="`git config --get pull.twohead`"
299 use_strategies
="$var"
301 use_strategies
="$default_twohead_strategies"
304 var
="`git config --get pull.octopus`"
307 use_strategies
="$var"
309 use_strategies
="$default_octopus_strategies"
315 for s
in $use_strategies
317 for ss
in $no_fast_forward_strategies
326 for ss
in $no_trivial_strategies
330 allow_trivial_merge
=f
339 common
=$
(git merge-base
--all $head "$@")
342 common
=$
(git show-branch
--merge-base $head "$@")
345 echo "$head" >"$GIT_DIR/ORIG_HEAD"
347 case "$allow_fast_forward,$#,$common,$no_commit" in
349 # No common ancestors found. We need a real merge.
352 # If head can reach all the merge then we are up to date.
353 # but first the most common case of merging one remote.
354 finish_up_to_date
"Already up-to-date."
358 # Again the most common case of merging one remote.
359 echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $1)"
360 git update-index
--refresh 2>/dev
/null
362 if test -n "$have_message"
364 msg
="$msg (no commit created; -m option ignored)"
366 new_head
=$
(git rev-parse
--verify "$1^0") &&
367 git read-tree
-v -m -u --exclude-per-directory=.gitignore
$head "$new_head" &&
368 finish
"$new_head" "$msg" ||
exit
373 # We are not doing octopus and not fast-forward. Need a
377 # We are not doing octopus, not fast-forward, and have only
379 git update-index
--refresh 2>/dev
/null
380 case "$allow_trivial_merge" in
382 # See if it is really trivial.
383 git var GIT_COMMITTER_IDENT
>/dev
/null ||
exit
384 echo "Trying really trivial in-index merge..."
385 if git read-tree
--trivial -m -u -v $common $head "$1" &&
386 result_tree
=$
(git write-tree
)
390 printf '%s\n' "$merge_msg" |
391 git commit-tree
$result_tree -p HEAD
-p "$1"
393 finish
"$result_commit" "In-index merge"
401 # An octopus. If we can reach all the remote we are up to date.
405 common_one
=$
(git merge-base
--all $head $remote)
406 if test "$common_one" != "$remote"
412 if test "$up_to_date" = t
414 finish_up_to_date
"Already up-to-date. Yeeah!"
420 # We are going to make a new commit.
421 git var GIT_COMMITTER_IDENT
>/dev
/null ||
exit
423 # At this point, we need a real merge. No matter what strategy
424 # we use, it would operate on the index, possibly affecting the
425 # working tree, and when resolved cleanly, have the desired tree
426 # in the index -- this means that the index must be in sync with
427 # the $head commit. The strategies are responsible to ensure this.
429 case "$use_strategies" in
431 # Stash away the local changes so that we can try more than one.
436 rm -f "$GIT_DIR/MERGE_STASH"
441 result_tree
= best_cnt
=-1 best_strategy
= wt_strategy
=
443 for strategy
in $use_strategies
445 test "$wt_strategy" = '' ||
{
446 echo "Rewinding the tree to pristine..."
449 case "$single_strategy" in
451 echo "Trying merge strategy $strategy..."
455 # Remember which strategy left the state in the working tree
456 wt_strategy
=$strategy
458 git-merge-
$strategy $common -- "$head_arg" "$@"
460 if test "$no_commit" = t
&& test "$exit" = 0
463 exit=1 ;# pretend it left conflicts.
466 test "$exit" = 0 ||
{
468 # The backend exits with 1 when conflicts are left to be resolved,
469 # with 2 when it does not handle the given merge at all.
471 if test "$exit" -eq 1
474 git diff-files --name-only
475 git ls-files --unmerged
477 if test $best_cnt -le 0 -o $cnt -le $best_cnt
479 best_strategy
=$strategy
486 # Automerge succeeded.
487 result_tree
=$
(git write-tree
) && break
490 # If we have a resulting tree, that means the strategy module
491 # auto resolved the merge cleanly.
492 if test '' != "$result_tree"
494 if test "$allow_fast_forward" = "t"
496 parents
=$
(git show-branch
--independent "$head" "$@")
498 parents
=$
(git rev-parse
"$head" "$@")
500 parents
=$
(echo "$parents" |
sed -e 's/^/-p /')
501 result_commit
=$
(printf '%s\n' "$merge_msg" | git commit-tree
$result_tree $parents) ||
exit
502 finish
"$result_commit" "Merge made by $wt_strategy."
507 # Pick the result from the best strategy and have the user fix it up.
508 case "$best_strategy" in
511 case "$use_strategies" in
513 echo >&2 "No merge strategy handled the merge."
516 echo >&2 "Merge with strategy $use_strategies failed."
522 # We already have its result in the working tree.
525 echo "Rewinding the tree to pristine..."
527 echo "Using the $best_strategy to prepare resolving by hand."
528 git-merge-
$best_strategy $common -- "$head_arg" "$@"
532 if test "$squash" = t
539 done >"$GIT_DIR/MERGE_HEAD"
540 printf '%s\n' "$merge_msg" >"$GIT_DIR/MERGE_MSG"
543 if test "$merge_was_ok" = t
546 "Automatic merge went well; stopped before committing as requested"
553 git ls-files
--unmerged |
554 sed -e 's/^[^ ]* / /' |
556 } >>"$GIT_DIR/MERGE_MSG"
558 die
"Automatic merge failed; fix conflicts and then commit the result."