repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sh/pull-rebase-preserve'
2013-09-04
Step
h
en Haberman
pull: allow
pull to preserv
e
m
e
r
ges when rebasing
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
St
e
phen H
a
berman
rebase
-
i-p: if todo was
r
e
o
r
dered use HEAD as the rewritte
n
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Steph
e
n Ha
b
erman
reb
a
se-
i
-p: do no
t
include non-
f
irst-p
a
rent commits
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
S
tephen Haberm
a
n
reb
a
se-i-p: only list c
o
m
m
its that require rewriting
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen Haber
m
an
r
eb
a
se-i-p: fix 'n
o
squashing merg
e
s' tripping up
n
on
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen H
a
b
erma
n
r
e
base-i
-
p: delay
sa
v
ing current-com
m
it to REWR
I
TTEN
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Step
h
e
n
Haberman
rebase
-
i-p: use H
E
AD for updati
n
g th
e
r
ef ins
t
e
a
d
o
f
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen Haber
m
a
n
reb
a
se
-
i-p
:
test to exclude comm
i
ts fro
m
t
odo bas
e
d
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
S
t
ephen
Haberman
rebase--intera
c
tive: fix p
a
r
e
nt rewr
i
ting for
d
roppe
d
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-09-29
Stephen
Haberman
Clarif
y
h
o
w
the us
e
r
can satisfy stash's 'dirty
s
t
ate
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree