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
remote: write correct fetch spec when renaming remote 'remote'
2011-09-12
Mart
i
n von Zweigberg
k
r
e
m
o
te: write correct fetch
spec when rena
m
i
n
g remo
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin vo
n
Zweigbergk
rebase: c
l
arify
"
r
e
s
tore t
h
e o
r
i
g
inal branch
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zwe
i
gbergk
D
o
cumenta
t
i
o
n: u
s
e [verse] for SYNOPSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Ma
r
tin von Z
w
eigbergk
diffco
r
e-rename: don't consider
unme
r
ged p
a
t
h
a
s
sou
r
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
M
a
rtin v
o
n Z
w
eigbergk
rebase: define op
t
ions
in
O
PTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zw
e
igberg
k
Makefi
l
e: do not ins
t
all
so
u
rced re
b
ase
s
cripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
arti
n
von
Z
weigbergk
merg
e
too
l
: don't skip modify/remove c
o
nf
l
ic
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Z
w
eigbergk
re
r
ere
"
remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbe
r
gk
reba
s
e: use @{upstr
e
a
m} if no
u
ps
t
ream sp
e
cified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
v
o
n
Z
weigber
g
k
rebase -
i
: remove unnecessary sta
t
e re
b
ase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igb
e
rgk
reb
a
se -i:
d
on't re
a
d
u
nused
va
r
iable preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
o
n
Zweigber
g
k
git-reb
a
s
e
--am: r
e
m
ove unnecessa
r
y --3wa
y
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
o
n
Zweigbergk
rebase -m: don't print
e
xi
t
code 2 when merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
v
o
n Zweigber
g
k
rebase -m: reme
m
ber all
o
w
_
rerere_autoupdate opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: remem
b
e
r
str
a
tegy and strateg
y
opt
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigberg
k
rebas
e
: remember verbose op
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbe
r
gk
r
e
base: extract code for writing basic stat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
weigbergk
rebase: factor out s
u
b comma
n
d handlin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zw
e
ig
b
ergk
reb
a
se: make -v a tiny bit mor
e
verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase -i
:
a
l
ign v
a
riable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin v
o
n Zweigberg
k
rebase
:
show consi
s
tent conflict resolution
h
int
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zwe
i
gbergk
rebase: extract am code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n
v
on
Z
weigbergk
re
b
ase: ext
r
a
c
t merge code to ne
w
s
o
u
rce f
i
le
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
on
Zweigbergk
reb
a
se: rem
o
ve
$branch as synon
y
m for $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
o
n Zweigbergk
reba
s
e -i: suppor
t
--st
a
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase: factor out call to pre-rebase
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase
:
factor
o
ut clean work tree c
h
eck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zw
e
igbe
r
gk
r
ebas
e
: f
a
ctor
o
ut reference parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zwe
i
gbergk
rebase: reorder v
a
lidation step
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase -i:
r
e
mo
v
e now
unneces
s
ary directory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
o
n
Zweigbergk
rebase:
f
act
o
r o
u
t command
line option
processin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigber
g
k
r
ebas
e
:
al
i
g
n
variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
re
b
a
s
e: stri
c
t
er c
h
eck of
standal
o
ne sub co
m
mand
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Zweig
b
er
g
k
rebase: a
c
t
on command line outsi
d
e
parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zweigb
e
rgk
rebase: improve
d
etection of
rebase in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigb
e
rgk
rebase: r
e
move unu
s
ed rebase sta
t
e 'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Z
w
e
i
gbergk
rebase: read state
o
utside
l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwe
i
gbergk
rebase: re
f
a
c
t
o
r readin
g
of st
a
te
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Z
w
e
i
g
bergk
reba
s
e
:
cl
e
a
re
r
names for directory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
M
artin von Z
w
eigbergk
co
m
pletion:
a
dd missing
c
o
n
figura
t
ion variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin v
o
n Zweigbe
r
g
k
Use reflog
i
n 'pull --reba
s
e
.
f
oo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
t
in von
Z
weigbergk
reba
s
e:
only show s
t
at if
c
onfigured
to t
r
ue
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Ma
r
tin von Zweigbergk
rebase --abort
:
do no
t
update
b
ranch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von
Z
we
i
g
b
er
g
k
rebas
e
: support --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zweigb
e
r
g
k
Docum
e
ntat
i
on/git-pull: cla
r
ify con
f
iguration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von
Zwe
i
gber
g
k
rebase -X: do not clobber strateg
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree