repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://git.bogomips.org/git-svn
2013-09-04
Stephen Haberman
pull: al
l
ow pull
to preserve merg
e
s when rebasing
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
St
e
phen Haberman
rebase-i-p: if todo was reorde
r
e
d
us
e
HEAD as the rewritten
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Steph
e
n Haberman
r
eba
s
e
-
i
-p: do
not
i
nc
l
ude non-
f
irst-par
e
nt commi
t
s
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen Haberman
rebase-i-p: only list
commits that require re
w
riting
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Ste
p
hen Haberman
rebas
e
-i-p: fix 'no squashing merges' trip
p
in
g
up non
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen Hab
e
rman
rebase-
i
-p: delay
sa
v
ing
c
urrent-co
m
mit to REWRIT
T
E
N
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen Habe
r
man
rebase-i-p
:
use HEAD for updatin
g
the ref instead o
f
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
St
e
p
h
en Haberman
re
b
a
se-i-p: test to excl
u
de commits from todo based
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-10-16
Stephen
H
aberman
rebase--in
t
eractive: fix p
a
rent r
e
w
ri
t
ing for dro
p
ped
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree
2008-09-29
Steph
e
n
Habe
r
man
Clarify how th
e
user c
a
n satis
f
y
stash's 'dirty st
a
t
e
.
.
.
Signed-off-by:
Stephen Haberman
<stephen@exigencecorp.com>
commit
|
commitdiff
|
tree