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 'jc/merge-blobs'
2012-12-23
Martin von Zw
e
igbergk
l
e
arn to
pick/revert into u
n
born branch
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-23
M
a
rtin vo
n
Zwe
i
gbergk
tests: move test_cmp_rev to
test-lib-functions
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
M
artin v
o
n Zw
e
igber
g
k
onewa
y
_merge():
only lsta
t
(
)
when t
o
l
d
t
o
update worktree
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Martin von Zweigbergk
reba
s
e us
a
g
e
: sub
c
ommands ca
n
not
b
e
combined with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Ma
r
tin von
Z
weig
b
ergk
cherry
-
p
ick/r
e
v
e
rt:
r
espect order of rev
i
sions to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Ma
r
t
in
v
o
n Zweigbe
r
gk
demonstrate broken 'git che
r
ry-pick three
one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin
v
on
Z
weigbergk
teac
h
log --no-
w
al
k
=u
n
sorted,
w
h
i
ch avoids
sort
i
ng
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin vo
n
Z
weigbergk
a
d
d tests for 'git re
b
as
e
--keep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
a
rtin von Zwei
g
bergk
cherry:
r
emov
e
redundant check for
m
e
rge c
o
m
mit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigb
e
rgk
cherry: don
'
t s
e
t
ignored
r
ev_info option
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von Zw
e
igber
g
k
rem
o
ve unnecessary param
e
ter fro
m
get_patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von Zweigbergk
add test cas
e
for rebase o
f
empty co
m
mit
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
on
Z
w
eigbergk
a
m
: don't
c
a
l
l
mailinfo if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
am --rebasing: get
p
atch body
from co
m
mit,
not fr
o
m
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigber
g
k
r
ebase --
r
oot: prin
t
usag
e
on
t
oo many args
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
rebase: d
o
n't
source
g
it
-
s
h
-set
u
p twice
commit
|
commitdiff
|
tree
2011-12-12
Martin v
o
n Zweigbergk
t3401: use test_
c
ommit i
n
setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Marti
n
v
on Zweigb
e
r
g
k
t3401: mo
d
ernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zweig
b
ergk
a
m
: d
o
n
't p
e
rsist keepcr fla
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
artin
von Zweigbergk
remo
t
e
: only upda
t
e re
m
o
te-tracking bran
c
h
i
f
updati
n
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Marti
n
von Zweigbergk
remo
t
e
r
ename: warn whe
n
refspec was no
t
updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbe
r
gk
remote: "
r
enam
e
o fo
o
" should not rena
m
e ref "ori
g
in
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
art
i
n von Z
w
e
i
gbergk
remote: write cor
r
ect f
e
t
ch spec w
h
en renam
i
ng
r
em
o
te
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zweigbergk
g
i
tk:
Show
modif
i
e
d
fil
e
s with 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
ify calcula
t
i
o
n
of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zweigber
g
k
gitk: R
u
n 'git
r
ev-parse --g
i
t-dir'
o
nly once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zweigbergk
gitk: Put temporary
direct
o
ry i
n
side
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Fix "Extern
a
l diff" with separat
e
work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
r
tin
v
o
n
Zweig
b
ergk
gi
t
k:
Fix "blame parent com
m
i
t"
w
ith
s
eparate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
o
n Zweigbergk
gitk:
Fix "sho
w
or
i
gin of
t
his line
"
with s
e
parate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
ig
b
ergk
gi
t
k: Fi
x
file high
l
ight w
h
en run in subdir
e
c
t
ory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zw
e
igbergk
rebase: clari
f
y "res
t
ore th
e
original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Marti
n
von
Z
weigbergk
Docume
n
tation: use [verse] for
S
Y
NOPSIS
sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigbergk
d
i
ffcore-rename: don't consi
d
er
unmerged path as sou
r
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Mart
i
n von Zweigbergk
rebase: define optio
n
s
in OPTIO
N
S_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
a
rtin von
Z
weigbergk
M
akefile:
d
o
not install s
o
urced reb
a
se scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mart
i
n von Zweigb
e
r
g
k
mergetool: don't
skip
m
odify/remove c
o
nfli
c
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
a
rtin vo
n
Zwei
g
bergk
rere
r
e "rema
i
nin
g
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweig
b
ergk
r
e
base: use @{u
p
strea
m
} if no u
p
stream spec
i
fied
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbe
r
gk
rebase -i:
remove un
n
ecessary
s
t
a
te r
e
base-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
rebase -i: don't
read unused
v
ar
i
able pre
s
e
rve_merg
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
git-reba
s
e--am: r
e
m
o
ve un
n
ecessary --3way opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwei
g
bergk
rebase -m: don't pri
n
t exi
t
c
o
de 2
w
hen merge fai
l
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zwe
i
g
b
ergk
rebase -m: re
m
e
m
be
r
allow_rerere_
a
utoupdate
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
er
g
k
rebase: reme
m
b
e
r s
t
ra
t
egy a
n
d strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebas
e
: r
e
m
e
mber verbose opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zwe
i
gbergk
rebase
:
extr
a
ct code for writ
i
ng
basic st
a
t
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweig
b
ergk
rebase: fac
t
or out sub command ha
n
dl
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin vo
n
Zweigbergk
re
b
ase: make -v a
t
iny b
i
t more verbos
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Z
w
ei
g
bergk
rebase -i: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigberg
k
rebase: show cons
i
ste
n
t conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on Z
w
e
ig
b
ergk
r
e
base:
e
xtract am code t
o
new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
be
r
gk
re
b
ase:
e
xt
r
act
m
e
r
ge code to new
so
u
rce f
i
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
von Zweigbergk
rebas
e
: remove
$branch as
s
ynonym for
$
orig_he
a
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
reb
a
se:
f
a
ctor out refere
n
ce parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on Zweigbergk
rebase -
i
: support --st
a
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Zweigbergk
rebase
:
reorder
validation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwei
g
bergk
rebase:
f
ac
t
or out call t
o
pre-reb
a
s
e
h
o
o
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebase -i: r
e
move no
w
unnecessary dire
c
t
o
ry checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
re
b
ase: f
a
ctor out c
l
ean
w
ork
tree
c
heck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Zweigbergk
rebase: factor out c
o
mmand line
o
ption
proces
s
i
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
vo
n
Zweigbergk
re
b
ase:
align variable
c
ontent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigberg
k
rebase: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwe
i
gbe
r
g
k
reb
a
se: str
i
cter check of standalone s
u
b comman
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
re
b
ase
:
act on
command line outsi
d
e
p
arsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase: improve detection of reb
a
se
in progr
e
ss
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
reba
s
e: remove unuse
d
reb
a
se state
'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase
:
read s
t
ate outsi
d
e
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
w
e
igbe
r
gk
reb
a
se: ref
a
c
t
or r
e
ading of st
a
te
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on
Zweig
b
ergk
rebase: c
l
ea
r
er names for
d
i
r
ect
o
ry variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zweigbergk
co
m
pletion: add missing
configuration
variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin vo
n
Zweigbe
r
gk
Use refl
o
g
in '
p
ull --rebase
.
foo
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mart
i
n von Zweigbergk
rebase: only show stat i
f
configur
e
d
to
t
rue
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von
Zweigbergk
re
b
ase --
a
bort:
d
o
not
u
p
date
b
ranch
ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweigbergk
reb
a
s
e: s
u
pport --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
artin von
Zweigbergk
Documentati
o
n/git-pull:
c
l
arify configu
r
at
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zwei
g
bergk
rebase -X: do not c
l
obber st
r
ategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree