repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'da/p4merge-mktemp' into maint
2012-12-23
Martin
von
Zweigbe
r
gk
l
ear
n
to pick/rev
e
rt into unborn b
r
anch
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-23
Marti
n
von
Z
w
e
i
gbergk
tests:
move test_cmp_rev
t
o t
e
st-lib-functions
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Martin v
o
n Zweigbergk
reb
a
se usage: subc
o
mma
n
ds
c
an no
t
be combined
w
ith
-i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mart
i
n von Zweigbergk
cherr
y
-pi
c
k
/rever
t
: respect or
d
er of revisions to
pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin v
o
n
Zweigbergk
demonstrate broken 'git
cherry-pi
c
k three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mar
t
in v
o
n
Zwei
g
bergk
teach log --no-w
a
lk=u
n
sorted,
w
h
i
ch av
o
ids sorti
n
g
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin
von Zweigbergk
add te
s
ts for 'git rebase --keep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
a
r
t
in von Zweigbergk
ch
e
rry: remove r
e
dundant check for merge commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von
Z
weig
b
e
rgk
cherry: don
'
t set ignored rev_
i
n
fo opt
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von Z
w
e
i
gbergk
rem
o
ve unnecessary p
a
rameter from get
_
patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von
Zweigbe
r
gk
add test case f
o
r re
b
as
e
of emp
t
y commit
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
on Zw
e
igbergk
am: don't call ma
i
linfo
i
f
$reba
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
am --reb
a
s
ing: get
pa
t
ch body from
c
ommit, not
from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mar
t
in von Zw
e
igbergk
re
b
ase
-
-
root: print
usag
e
on
t
oo many ar
g
s
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin von
Z
w
eigber
g
k
rebase
:
don't
s
ource
g
it-sh
-
s
etup twic
e
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zw
e
igbergk
t3
4
01:
u
se
t
e
s
t
_commit in
s
e
t
u
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von
Z
weigbergk
t3401: modernize s
t
yle
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
M
a
rtin vo
n
Zweigber
g
k
am: don't
p
e
rsi
s
t keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin v
o
n
Zweig
b
ergk
re
m
ote: only updat
e
rem
o
te-tracking branch if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Marti
n
vo
n
Zweigbergk
remote ren
a
me: war
n
w
hen refspec was not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin vo
n
Zweigb
e
rg
k
r
e
m
ote: "rena
m
e o foo"
s
ho
u
l
d
not rename ref "orig
i
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
r
emote:
w
rite correct f
e
tch
spec when re
n
aming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zwei
g
bergk
gitk:
Show modified files wi
t
h separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk
:
Simp
l
i
f
y cal
c
ulation
o
f gitdi
r
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
v
o
n
Zwe
i
gbergk
git
k
: Run 'git rev-
p
ars
e
--git
-
dir
'
only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin
vo
n
Zweigbergk
g
itk: Put
t
e
mporary
direc
t
ory inside
.
g
i
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
o
n
Zw
e
i
g
bergk
gitk: Fix "Ext
e
rnal diff" with separat
e
work
t
ree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Z
w
e
i
gbergk
gitk: Fix "
b
lame parent com
m
it" with se
p
a
rate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
ti
n
von
Zweigbergk
g
i
tk: Fix
"
sho
w
origin of this line" with separa
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin
v
on Zweigber
g
k
gitk: Fix file
h
ighlight when
r
un in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zweigbergk
rebase: clarif
y
"resto
r
e the orig
i
nal branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin vo
n
Zw
e
i
g
b
e
r
gk
Docum
e
ntation: us
e
[v
e
rse]
f
or SYNOPSIS sect
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigbergk
d
i
ffcore-re
n
ame: don't co
n
sider unmerg
e
d path a
s
source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von
Z
weigbe
r
gk
rebase
:
de
f
ine o
p
t
ions in
OPT
I
ONS_SP
E
C
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Mar
t
in
von Zweigber
g
k
M
a
k
efile: do not ins
t
all
sourc
e
d
r
e
b
as
e
s
cripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigb
e
rgk
merg
e
to
o
l: don'
t
skip m
o
dify/remove con
f
lic
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mar
t
in von Zweig
b
e
rgk
rerere "rem
a
ining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
u
se
@
{u
p
stre
a
m
} i
f
n
o
u
pstream s
p
ecified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zwei
g
ber
g
k
r
ebase -i: rem
o
ve un
n
ecessary state rebase
-
root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase -i: don't read unused variable
preserv
e
_me
r
ges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
we
i
g
b
ergk
git-rebase--
a
m: rem
o
v
e
un
n
ecessary
-
-
3
way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zwei
g
be
r
gk
rebas
e
-m: don'
t
print exit code 2 when merge fai
l
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigb
e
rgk
r
e
ba
s
e -m
:
r
eme
m
ber a
l
low_rerere_autoupdate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigber
g
k
rebase:
r
emember
s
trategy and s
t
rate
g
y options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in
von
Zweigbergk
rebase: remember verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
r
ebase: extract code for w
r
iting basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
re
b
ase: fa
c
t
or out su
b
co
m
m
a
nd handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin vo
n
Zwe
i
gbergk
re
b
ase: m
a
ke -v a tiny bit
mor
e
v
erbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigb
e
rgk
rebase -i:
a
lign variable
n
ames
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Z
weigbergk
rebase: show
co
n
sistent conflict res
o
lu
t
ion h
i
nt
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n
Zwei
g
bergk
rebase:
e
x
t
r
a
c
t am code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: extr
a
ct
m
e
rge
c
ode t
o
n
e
w source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
v
o
n Zwei
g
b
e
rgk
rebase: remove $branch
as synonym
f
or $
o
rig_he
a
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
v
o
n Zweigbergk
r
eb
a
se: factor out refere
n
c
e pars
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
r
e
base -i
:
support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
i
n
v
o
n
Zweigbergk
r
e
bas
e
: reo
r
de
r
v
alidation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in
von
Zwei
g
bergk
reba
s
e
:
factor out c
a
ll to pr
e
-
rebase hoo
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: remove now unn
e
cessary directory che
c
ks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
factor
out c
l
ean
w
o
r
k
tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigberg
k
reba
s
e: f
a
ctor out
command line op
t
i
o
n process
i
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
reb
a
se: align
v
ariab
l
e content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
vo
n
Z
w
e
i
gbergk
rebase: ali
g
n variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
von Zweig
b
ergk
rebas
e
:
str
i
cter check of sta
n
dalone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweig
b
e
r
g
k
r
e
b
ase
:
act on
command line out
s
i
de parsing l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zw
e
igberg
k
rebase: improve
detec
t
ion of rebase
in progres
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zweigbe
r
gk
rebase: r
e
move unused
rebase state 'pre
v
_
h
ead'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von
Zweigbergk
re
b
ase: read state
out
s
ide l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase:
refactor
read
i
ng of s
t
ate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on Zweigbergk
r
e
base: clearer n
a
mes
for direct
o
ry vari
a
bles
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von
Zw
e
igber
g
k
completion: ad
d
m
issing configuration
variabl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweig
b
ergk
Use refl
o
g in 'pu
l
l
-
-rebase
.
f
oo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
tin von Zweigbergk
rebase:
o
n
ly show stat
i
f co
n
figured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zwe
i
gbergk
rebase --abort: do not updat
e
branch
r
e
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zwe
i
g
bergk
rebase: support
-
-
verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Z
w
eigberg
k
D
ocumentation/git-pull
:
clari
f
y conf
i
guration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin
v
on Zwei
g
bergk
rebase
-X: do not clobber strate
g
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree