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
cherry: remove redundant check for merge commit
2012-07-30
M
a
rtin von Zwe
i
gberg
k
cherry: remove red
u
nd
a
nt chec
k
for merge
commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
a
rtin von Zweigbergk
cherry: don't s
e
t ignored rev_
i
nfo options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von Zweigbergk
r
emove unnecessar
y
paramet
e
r from get_patch_
i
ds()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
M
a
r
t
in von Zweigbe
r
g
k
add test c
a
se for reb
a
se of empty commi
t
commit
|
commitdiff
|
tree
2012-06-26
M
artin von Zw
e
i
g
bergk
am: d
o
n't call mailinfo
if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von
Z
w
e
i
gbergk
am --rebasi
n
g:
g
e
t pat
c
h
body fro
m
c
ommit, not
fr
o
m
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
rebase --
r
o
o
t: print usage on too
many args
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin v
o
n Z
w
eigber
g
k
reb
a
se: don't
s
ource
git-sh-set
u
p twi
c
e
commit
|
commitdiff
|
tree
2011-12-12
M
a
r
tin von Zweigb
e
rgk
t3401: use test_comm
i
t in setu
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin
von Zweigber
g
k
t34
0
1: m
o
dernize st
y
le
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
M
a
rtin
von
Zweigb
e
rgk
a
m
: d
o
n't persist kee
p
cr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
von Zweigber
g
k
remote
:
only
u
pd
a
te remote-tracki
n
g branch if updati
n
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rtin von Zweigberg
k
remo
t
e re
n
ame: warn whe
n
refspe
c
was not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweig
b
e
r
gk
remote:
"
rename o f
o
o" should n
o
t renam
e
ref "o
r
igin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zw
e
igbergk
remote: write
c
orrect fet
c
h spec when r
e
nami
n
g remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igbergk
git
k
:
S
how mo
d
ifi
e
d files
w
ith separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in von Zweigbergk
git
k
: S
i
mp
l
ify calculation
of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin v
o
n
Z
weigbergk
g
i
tk: Run 'git
r
e
v
-p
a
rse --git-
d
ir' o
n
ly once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigberg
k
gitk: Pu
t
temporary d
i
rector
y
i
nside
.
g
it
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Z
weigberg
k
git
k
:
F
i
x
"Ex
t
ernal diff
"
with separa
t
e
w
ork tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigb
e
rgk
g
itk: Fix "blame pare
n
t com
m
it" with se
p
arate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zweigb
e
rgk
gi
t
k: Fix "
s
ho
w
origin
o
f this lin
e
" with separ
a
te
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: F
i
x file highlight when
r
un in
s
ubdir
e
ctory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
M
a
r
t
in von
Z
weigbergk
rebase: clarify "restor
e
t
he original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zweigbergk
Docum
e
n
t
a
t
i
on: use [verse] fo
r
SY
N
OPSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigb
e
r
gk
diffc
o
re-
r
ena
m
e:
d
on't consider unmerged
path as so
u
rc
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zw
e
igbergk
rebase:
de
f
ine
option
s
in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Mart
i
n von
Z
wei
g
bergk
Mak
e
fil
e
: do not install sourced rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
v
on Zwe
i
gbergk
mergetool:
don't skip m
o
dify/remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
v
on Zweigberg
k
rerere "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weig
b
e
r
gk
rebase: use @{upstream} if no upstream sp
e
cified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Z
w
e
ig
b
ergk
rebase
-i: remove un
n
ecessary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zweigbergk
reba
s
e
-i: don't read unused var
i
able preserve_m
e
rges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin vo
n
Zw
e
igbergk
git-rebase--am: remove unnecess
a
ry --
3
wa
y
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -
m
: don't print exit co
d
e 2 w
h
en merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwei
g
b
e
rg
k
rebase -m: remembe
r
allo
w
_rerere_aut
o
up
d
ate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zweigbergk
rebase: re
m
ember strat
e
gy
and strategy op
t
ions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n
von
Z
we
i
gb
e
rgk
rebase:
reme
m
b
er verb
o
se option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
o
n
Zweigbergk
r
e
base: extr
a
ct code for
writing bas
i
c state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Z
weigbergk
rebase: fac
t
or out sub
c
om
m
and handlin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase
:
ma
k
e -v
a
tiny bit more
v
erbos
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
r
e
b
ase -i: a
l
ign variable name
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase
:
show consistent
conflict reso
l
ution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
rebase: extract am co
d
e t
o
new
s
ource
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwei
g
bergk
re
b
ase: ex
t
ract merg
e
code to n
e
w
source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
re
b
ase: remove $branch as
s
ynonym for $orig_
h
ead
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
w
e
igbergk
reb
a
se
:
factor out
r
efere
n
ce pars
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbe
r
gk
rebase -i: su
p
p
o
rt --stat
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: reorder validatio
n
steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zwei
g
bergk
rebase: facto
r
out c
a
ll to pre
-
rebase
h
o
o
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i:
r
emove now unne
c
essar
y
d
ir
e
ctory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigb
e
rg
k
rebase: fac
t
or out clean
wor
k
tree
c
h
ec
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
re
b
a
se: factor ou
t
comm
a
n
d lin
e
opt
i
on processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigb
e
rgk
reb
a
se: align v
a
riable co
n
tent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweig
b
ergk
rebas
e
: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Zweigbe
r
gk
r
e
b
a
se: stricter ch
e
ck
o
f standalone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase: act
o
n
com
m
a
n
d li
n
e
o
utside parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
b
a
se: improve
d
etectio
n
of r
e
base in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebas
e
: remove unused rebase state
'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweig
b
e
rgk
r
ebas
e
: read state ou
t
side loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebas
e
: ref
a
ctor re
a
ding of
s
tate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase: c
l
earer name
s
f
o
r
direct
o
ry variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin
v
on Zwe
i
gbergk
completion:
a
d
d
missing configuration variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von
Z
w
eigbe
r
gk
Use reflog in 'pull --rebas
e
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mar
t
in von
Z
weigbergk
rebase: only show s
t
at if config
u
red to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
a
rti
n
von Zweigb
e
rgk
rebase --abo
r
t: do not
u
pdate
branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
artin von Zweigbergk
rebase: suppor
t
-
-
ve
r
ify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
artin von Zweigbergk
D
o
c
u
m
e
ntation/git-pul
l
: cla
r
ify
configu
r
a
tion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Marti
n
von Zwei
g
bergk
re
b
ase
-X: do
no
t
clobber stra
t
egy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree