projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Do not send "want" lines for complete objects
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
d12a2a9
..
3465041
100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-26,7
+26,7
@@
dropsave() {
savestate() {
# Stash away any local modifications.
git-diff-index -r -z --name-only $head |
savestate() {
# Stash away any local modifications.
git-diff-index -r -z --name-only $head |
- cpio -0 -o >"$GI
R
_DIR/MERGE_SAVE"
+ cpio -0 -o >"$GI
T
_DIR/MERGE_SAVE"
}
restorestate() {
}
restorestate() {
@@
-103,7
+103,7
@@
echo "$head" >"$GIT_DIR/ORIG_HEAD"
case "$#,$common" in
*,'')
case "$#,$common" in
*,'')
- die "Unable to find common commit between $head_arg and $*"
+ # No common ancestors found. We need a real merge.
;;
1,"$1")
# If head can reach all the merge then we are up to date.
;;
1,"$1")
# If head can reach all the merge then we are up to date.