Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t5505: do not assume the "matching" push is the default
[gitweb.git]
/
git-rebase--merge.sh
diff --git
a/git-rebase--merge.sh
b/git-rebase--merge.sh
index dc599077f0e55472ae814ed4e15f5b3a1b729caf..b10f2cf21b904bbbc3fafc27d183d8ad7917b479 100644
(file)
--- a/
git-rebase--merge.sh
+++ b/
git-rebase--merge.sh
@@
-3,8
+3,6
@@
# Copyright (c) 2010 Junio C Hamano.
#
-. git-sh-setup
-
prec=4
read_state () {