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
pull: allow pull to preserve merges when rebasing
2013-09-04
Step
h
en Hab
e
rman
pull:
allow pull to preserve merge
s
when rebasing
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
S
tephen Haber
m
a
n
rebase-i-p: if todo was
re
o
rdere
d
use HE
A
D
a
s the
r
e
wri
t
ten
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen Haberman
rebase-i-p: do not incl
u
de non
-
fi
r
st
-
p
arent c
o
mmits
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen
H
aberman
reb
a
se-i-p: only list
commits that require
r
ewriting
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Step
h
en Haberman
r
e
b
ase-i-p: fi
x
'
no
s
qua
s
h
i
n
g merges' trippin
g
up
n
on
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Ste
p
hen Haberman
rebase
-
i-p: delay saving current-c
o
m
m
it to REWRITTEN
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
S
t
ep
h
en Haberman
rebase
-
i-p:
u
s
e
HEA
D
for updating
the ref instead of
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
St
e
ph
e
n
Haber
m
an
r
e
base
-
i
-
p: t
e
st to exclude commits fr
o
m todo bas
e
d
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
S
t
ephen
H
a
b
erman
reba
s
e--inter
a
ctive: fix parent r
e
writing fo
r
d
r
opped
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-09-29
Stephen Haberma
n
C
l
arif
y
how the user
c
a
n s
a
tisfy
stash
'
s 'dirty state
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree