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
Documentation: rerere's rr-cache auto-creation and rerere.enabled
2011-09-12
Mar
t
in von Zweigbergk
remote:
only update
r
emo
t
e-tracking branch if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rtin von Zwe
i
g
b
ergk
r
e
mote rename: warn wh
e
n refspec was
n
o
t
updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote: "rename o foo"
should not re
n
ame ref
"
o
rigin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
r
tin von Zwei
g
bergk
remote: write corre
c
t fetch spec when re
n
aming r
e
m
ote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
M
ar
t
in von Zweigbergk
rebase: clarify "
r
es
t
ore the original bra
n
ch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von
Z
weigbergk
Documentati
o
n: use [ver
s
e] for
SYNOPSIS se
c
tio
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
a
rt
i
n von
Zwe
i
gbergk
diffcore-rename
:
don't consi
d
e
r unmer
g
ed p
a
th
as sour
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Marti
n
vo
n
Zwe
i
gbergk
r
ebase: defin
e
optio
n
s
i
n OPT
I
ONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zw
e
igbergk
Makefile: do not insta
l
l
s
o
urced
rebase sc
r
ipts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mart
i
n
von Zwe
i
gberg
k
mergetool: d
o
n
'
t sk
i
p mo
d
ify/remo
v
e conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
artin von
Z
weigbergk
rerere "re
m
a
ini
n
g
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebase: use @{upstream}
i
f no
ups
t
ream
s
p
e
cified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
e
rgk
rebase -i: remove unnecessary state rebase-
r
o
ot
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
weigbergk
rebas
e
-
i: do
n
't read unused varia
b
le preserve_m
e
rges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Z
weigbergk
git-r
e
b
ase--am: r
e
m
o
ve unnecessary
-
-3way
opt
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
igbergk
rebase -m
:
d
o
n't p
r
int exit code 2 when mer
g
e fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigbergk
rebase
-
m: remembe
r
all
o
w_rerere_autoupda
t
e
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Z
weigb
e
rg
k
rebase: remember strategy and strategy opti
o
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwe
i
g
bergk
rebase: remember
verbose opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigbergk
re
b
ase
:
extract code for writing basic
stat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igberg
k
rebase: factor
o
u
t
sub comm
a
nd handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
eigbergk
reba
s
e: make -v a
tiny bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
von Zwe
i
gb
e
rgk
r
e
base
-i: align
v
ariable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase:
s
how con
s
istent conflict reso
l
ution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Zw
e
igbergk
rebas
e
: extract
am
code t
o
new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwei
g
bergk
rebase: extrac
t
merg
e
code
to new
source
fi
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
i
g
bergk
rebase:
r
emove $br
a
nch as synonym for $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwei
g
be
r
gk
r
e
base -i: support
--stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweig
b
e
rgk
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
Z
w
e
i
gbergk
rebas
e
: f
a
ct
o
r out c
l
e
an w
o
rk tree
c
h
e
ck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebas
e
: factor out refere
n
ce parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zweigberg
k
rebase:
r
eor
d
er validation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zwei
g
b
ergk
rebase -
i
:
remove now unnecessary directory chec
k
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebas
e
:
fact
o
r out command line option
processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von Zweigbergk
rebas
e
: align var
i
able content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
rebase: al
i
gn variable nam
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase
:
s
tricte
r
chec
k
of
s
tandalone s
u
b command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
r
e
b
a
se:
a
c
t
on comm
a
nd line outside pars
i
ng loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweigbe
r
gk
r
e
base: impro
v
e detect
i
o
n of r
e
b
ase in p
r
ogress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
r
e
base: remove unused r
e
base state 'pre
v
_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on Zweigbergk
rebase:
r
e
a
d stat
e
outsi
d
e loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in v
o
n Zweigbergk
rebase: refact
o
r read
i
ng
o
f st
a
t
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zweigbergk
rebase: clearer names fo
r
d
i
re
c
tory variabl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin
v
on Zweigber
g
k
co
m
pletio
n
: add missing co
n
fig
u
r
ation variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
tin von Zweigber
g
k
U
s
e reflog in 'pull --rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
r
e
base:
o
nly sh
o
w
s
tat if configured
t
o true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Marti
n
vo
n
Z
w
eigbergk
rebase --abort: do not update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Marti
n
von
Zwei
g
b
e
r
gk
r
e
base: support
-
-verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
ar
t
in
von Zwe
i
gbergk
Documentat
i
on/git-pu
l
l
:
clarify
c
on
f
i
g
uratio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Marti
n
vo
n
Zw
e
ig
b
ergk
rebase -
X
:
do not clobber st
r
ategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree