mirror of
https://github.com/git/git.git
synced 2024-10-07 09:11:20 +02:00
Merge with master.
This merges commit bfe19f876cb20bea606e1a698030c017f31965c1 from master into our head commit 7a59013290bb26b80c997e5698757a735f1a92e0 Sincerely, jit-merge command.
This commit is contained in:
commit
55bc3fe36a
@ -1,5 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
. git-sh-setup-script || die "Not a git archive"
|
. git-sh-setup-script || die "Not a git archive"
|
||||||
git-read-tree --reset HEAD
|
rev=$(git-rev-parse --revs-only --verify --default HEAD "$@") || exit
|
||||||
|
rev=$(git-rev-parse --revs-only --verify $rev^0) || exit
|
||||||
|
git-read-tree --reset "$rev" && echo "$rev" > "$GIT_DIR/HEAD"
|
||||||
git-update-cache --refresh
|
git-update-cache --refresh
|
||||||
rm -f "$GIT_DIR/MERGE_HEAD"
|
rm -f "$GIT_DIR/MERGE_HEAD"
|
||||||
|
Loading…
Reference in New Issue
Block a user