diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-02 22:52:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-02 22:52:14 -0700 |
| commit | 5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3 (patch) | |
| tree | 9f68d81a31f8dfe7af6096e7beac2dc0997c143a /git-merge-stupid.sh | |
| parent | 36e5e70e0f40cf7ca4351b8159d68f8560a2805f (diff) | |
| download | git-5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3.tar.gz git-5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3.tar.xz | |
Rewrite "git-frotz" to "git frotz"
This uses the remove-dashes target to replace "git-frotz" to "git frotz".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-stupid.sh')
| -rwxr-xr-x | git-merge-stupid.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-merge-stupid.sh b/git-merge-stupid.sh index 4faecb933..4b1e59536 100755 --- a/git-merge-stupid.sh +++ b/git-merge-stupid.sh @@ -40,10 +40,10 @@ case "$bases" in for c in $bases do rm -f $G - GIT_INDEX_FILE=$G git-read-tree -m $c $head $remotes \ + GIT_INDEX_FILE=$G git read-tree -m $c $head $remotes \ 2>/dev/null || continue # Count the paths that are unmerged. - cnt=`GIT_INDEX_FILE=$G git-ls-files --unmerged | wc -l` + cnt=`GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l` if test $best_cnt -le 0 -o $cnt -le $best_cnt then best=$c @@ -63,10 +63,10 @@ case "$bases" in ;; esac -git-update-index --refresh 2>/dev/null -git-read-tree -u -m $common $head $remotes || exit 2 +git update-index --refresh 2>/dev/null +git read-tree -u -m $common $head $remotes || exit 2 echo "Trying simple merge." -if result_tree=$(git-write-tree 2>/dev/null) +if result_tree=$(git write-tree 2>/dev/null) then exit 0 else |