repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mm/mediawiki-dumb-push-fix'
2013-09-04
Stephen
Haberman
pu
l
l: allow pull to preserve merges when
r
ebasing
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen Haberman
r
e
ba
s
e-i
-
p: i
f
t
odo w
a
s r
e
ord
e
red use HE
A
D as the rew
r
itten
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen Haberman
rebase-i-p:
do not include n
o
n
-
first
-
parent c
o
mmit
s
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephe
n
Haberman
rebas
e
-i-
p
: only
l
is
t
commits
that require rewriti
n
g
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
S
t
e
p
hen Haberman
rebase-i-p: fix 'no squashing merges' tripping up non
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen Habe
r
man
rebase-i-p: dela
y
saving current-comm
i
t to REWRITTEN
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen
H
a
berman
rebase
-
i-p: use HEAD for updating the
ref instead
of
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen Haberman
rebase-i-p: test to exclude c
o
mm
i
ts from todo
b
as
e
d
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
S
t
ephe
n
Haberm
a
n
rebase--
i
nteractive: f
i
x
p
a
ren
t
r
ewriting for dropped
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-09-29
Stephe
n
Haberman
Clarify how t
h
e user
c
a
n satisfy stash's 'd
i
rty state
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree