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
git-check-attr: Handle each error separately
2011-07-14
Martin von Zw
e
igbergk
rebase: clarif
y
"r
e
s
t
ore the or
i
gi
n
al branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Ma
r
tin v
o
n Zw
e
i
g
berg
k
Documentat
i
on: us
e
[vers
e
]
f
or SYNOPSIS
sec
t
ions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
a
r
ti
n
von Zw
e
i
gberg
k
diff
c
or
e
-rename: don't consider un
m
e
r
ged pa
t
h as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Ma
r
tin von Zweigber
g
k
reb
a
se: define options in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
artin von Zwe
i
gbergk
Mak
e
file: d
o
not install sourc
e
d rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
artin von Zweigb
e
rgk
mergetoo
l
:
don't skip m
o
dify
/
remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
a
rt
i
n von Zweigbergk
re
r
e
re "rema
i
ni
n
g"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
reba
s
e:
use @{upstream} if no upstream specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n
Z
w
e
ig
b
ergk
rebase -i: re
m
ove unnecess
a
ry state re
b
a
s
e
-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in
v
on Zweigbe
r
gk
r
eba
s
e
-i:
don'
t
rea
d
unu
s
ed variable
p
r
e
serve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
git-rebase--a
m
:
r
emove unn
e
cessary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigb
e
rgk
reb
a
se -m: do
n
't print exit
code
2 w
h
en mer
g
e fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zw
e
i
g
b
ergk
rebase -m
:
r
e
me
m
ber allow_re
r
ere_autoupdate opt
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigberg
k
reba
s
e:
r
emember st
r
ategy
and strategy opt
i
o
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Zw
e
i
g
bergk
rebase: remember verbos
e
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n von
Z
weigbergk
re
b
ase: extract cod
e
for wr
i
ting basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Zweigbergk
rebase: factor out sub command han
d
ling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase: make -v
a tiny bit
m
ore
v
erbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin v
o
n
Z
weigbergk
rebase -i: align va
r
iable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwe
i
gbergk
re
b
a
s
e
: show consiste
n
t conflic
t
resolutio
n
hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on
Z
w
eigbergk
r
e
b
a
se:
ex
t
ract am
c
ode to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zw
e
i
gber
g
k
rebase: extract merge code to new
source f
i
le
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
se: re
m
ove
$
bran
c
h as
s
ynony
m
for $ori
g
_h
e
ad
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Z
weigbergk
r
eb
a
se -i: sup
p
o
r
t -
-
stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
o
n
Zwei
g
be
r
gk
r
e
base: factor out
c
all to pre-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
e
i
gbergk
r
e
bas
e
: fa
c
to
r
out clean work tree
check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eigbergk
rebase: fa
c
to
r
out reference
parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbe
r
gk
reb
a
s
e: reorder validation s
t
ep
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zw
e
igbergk
r
eb
a
se -
i
:
remov
e
now unnecessary dire
c
tory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin vo
n
Zweigber
g
k
rebase: f
a
ctor
o
u
t comm
a
nd
line optio
n
pr
o
cessing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweig
b
ergk
re
b
a
s
e: al
i
g
n
variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
wei
g
ber
g
k
rebase: align varia
b
le names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von Zweigbergk
reba
s
e:
s
t
r
ic
t
e
r check o
f
st
a
n
d
alone sub
command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zwe
i
gbergk
rebase: act on command line o
u
tsid
e
parsing l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
we
i
g
b
ergk
r
e
base: imp
r
ove detection
o
f rebase in pr
o
gre
s
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Z
we
i
gbergk
rebase: remo
v
e u
n
used r
e
base state
'
prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
vo
n
Z
weigbergk
rebase:
r
e
ad s
t
ate
ou
t
side
l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zw
e
igbergk
rebas
e
: refactor reading o
f
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
re
b
ase: clearer n
a
m
es
f
o
r directory variabl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin vo
n
Zweigbergk
completion: a
d
d missin
g
configuration variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von
Z
weigbergk
Use reflog in '
p
ull --re
b
as
e
.
fo
o
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von
Z
weigbergk
rebase:
on
l
y
s
h
o
w
sta
t
if c
o
n
figured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Z
w
eigbergk
r
ebase --abort: do not
u
pdate branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Marti
n
von Zweigberg
k
rebas
e
: support --ve
r
i
f
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
a
r
tin von Zweigb
e
r
g
k
Docu
m
e
ntation
/
git-pull: clarify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigber
g
k
rebase -
X
: d
o
not clobber strateg
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree