mirror of
https://github.com/git/git.git
synced 2024-05-25 19:26:38 +02:00
ef0bfa25e9
Both of these scripts will end up resetting the index to some specific head, and any unresolved merge will be forgotten.
6 lines
110 B
Bash
Executable File
6 lines
110 B
Bash
Executable File
#!/bin/sh
|
|
: ${GIT_DIR=.git}
|
|
git-read-tree --reset HEAD
|
|
git-update-cache --refresh
|
|
rm -f "$GIT_DIR/MERGE_HEAD"
|