diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-26 21:36:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-26 21:36:10 (GMT) |
| commit | 1ef9e05dbf36a80bb65fb150dd7bdd60852db777 (patch) | |
| tree | 319b38fbc0efc75d216bacccbeb53cc3ed42e50f /git-reset.sh | |
| parent | 6a0dbb8a5c41770c2280de15c3202970c6515ccc (diff) | |
| parent | 7d0c68871a86df0654454df047458836afa13129 (diff) | |
| download | git-1ef9e05dbf36a80bb65fb150dd7bdd60852db777.zip git-1ef9e05dbf36a80bb65fb150dd7bdd60852db777.tar.gz git-1ef9e05dbf36a80bb65fb150dd7bdd60852db777.tar.bz2 | |
Merge branch 'jc/squash'
* jc/squash:
git-merge --squash
Diffstat (limited to 'git-reset.sh')
| -rwxr-xr-x | git-reset.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-reset.sh b/git-reset.sh index 296f3b7..46451d0 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -61,4 +61,4 @@ case "$reset_type" in ;; esac -rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" +rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG" |