kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

rebase --merge: return control to caller, for housekeeping 

Return control to the caller git-rebase.sh to get these two tasks

    rm -fr "$dotest"
    git gc --auto

done by it.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ramkumar Ramachandra 2013-05-12 17:26:40 +05:30 committed by Junio C Hamano
parent 15d4bf2e1e
commit 01a1e6465f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-rebase--merge.sh
View File

@ -96,7 +96,6 @@ finish_rb_merge () {
"$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
fi fi
fi fi
rm -r "$state_dir"
say All done. say All done.
} }


@ -110,7 +109,7 @@ continue)
continue_merge continue_merge
done done
finish_rb_merge finish_rb_merge
exit return
;; ;;
skip) skip)
read_state read_state
@ -122,7 +121,7 @@ skip)
continue_merge continue_merge
done done
finish_rb_merge finish_rb_merge
exit return
;; ;;
esac esac