Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
tutorial: shorthand for remotes but show distributed nature of git
[gitweb.git]
/
git-rebase.sh
diff --git
a/git-rebase.sh
b/git-rebase.sh
index 828c59ce61a8317f23ba9113e4de6e09a58e70ce..c8bd0f99d1306cd311eaf45f73581efc8bb0e512 100755
(executable)
--- a/
git-rebase.sh
+++ b/
git-rebase.sh
@@
-27,8
+27,12
@@
Example: git-rebase master~1 topic
/ --> /
D---E---F---G master D---E---F---G master
'
+
+SUBDIRECTORY_OK=Yes
. git-sh-setup
set_reflog_action rebase
+require_work_tree
+cd_to_toplevel
RESOLVEMSG="
When you have resolved this problem run \"git rebase --continue\".