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 1.7.12.1
2012-08-30
M
artin
von Zweigbergk
ch
e
rry-p
i
ck/rev
e
rt: resp
e
ct order o
f
revision
s
to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Ma
r
ti
n
von Zweigbergk
demonstrat
e
broken 'git cherry-p
i
ck t
h
ree one
t
wo'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zw
e
i
g
bergk
teach log --no-walk=unsorted, which av
o
ids s
o
rting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin
v
on
Z
weig
b
ergk
ad
d
tests fo
r
'git re
b
ase --keep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von Zwei
g
bergk
ad
d
tes
t
case
f
or rebase of
emp
t
y commit
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin von Zweigbergk
am
:
don't c
a
ll m
a
ilinfo if $rebasin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mar
t
i
n von
Zwe
i
g
b
er
g
k
am --rebasing: get patch body
f
rom
co
m
m
it,
n
ot f
r
om
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
a
r
tin von Zw
e
igbergk
reb
a
s
e --root: pri
n
t
u
s
age on
t
oo man
y
args
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigb
e
rgk
reba
s
e:
d
on't source git-
s
h-setup twic
e
commit
|
commitdiff
|
tree
2011-12-12
Martin
v
on
Z
weigbergk
t3401: use test_commit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Marti
n
von Zweigbergk
t3401: modernize
s
tyle
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
M
artin von
Zweigbergk
am: don't p
e
rsist keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
we
i
gbergk
remot
e
: only
u
p
d
a
te re
m
ote
-
tra
c
king b
r
a
n
ch
i
f updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigb
e
r
g
k
remote re
n
ame: w
a
rn wh
e
n
refs
p
ec was
not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
arti
n
von Zweigbergk
r
e
mote: "rename o foo" sho
u
ld not
r
ename ref "orig
i
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin
v
o
n Zweigbergk
remote: write correct
fetch spec when
renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigb
e
rgk
g
itk:
S
ho
w
mo
d
ified fil
e
s wi
t
h sep
a
rate work tre
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigb
e
rg
k
gitk:
Simplify calculatio
n
o
f
gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
arti
n
v
o
n Zwe
i
gbergk
gitk:
R
un 'git rev-parse --git-dir' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zwe
i
gbergk
gitk
:
Pu
t
te
m
porary dir
e
ctory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
r
tin vo
n
Zweigbergk
g
i
t
k
: Fix "External diff" with
s
eparate
w
ork tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwei
g
bergk
gitk: Fix "b
l
ame parent commit" w
i
t
h
sepa
r
ate
w
o
r
k
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von
Z
w
eigbergk
g
i
tk: Fix "s
h
ow orig
i
n of this line" with
separat
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rt
i
n von
Zweigbergk
g
itk: Fix file highlight w
h
en run in
s
u
b
directory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Ma
r
tin von Zwe
i
gberg
k
rebase: clarif
y
"
r
est
o
re
t
h
e
original branch
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
M
artin v
o
n
Zwei
g
b
e
rgk
Documentation: use
[verse]
f
or S
Y
NOPSI
S
secti
o
ns
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Ma
r
tin
v
on Z
w
eigb
e
r
g
k
diffcore-rename: don't consider un
m
e
rge
d
path as sour
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Z
w
ei
g
b
e
r
gk
reb
a
se
:
define opti
o
ns in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zweigbergk
Make
f
ile: do not
in
s
t
all so
u
rced re
b
ase scr
i
pts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zw
e
igbergk
mergetool: don't skip modify/r
e
move confl
i
ct
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
a
rtin von Zweigbergk
r
e
rere "remaini
n
g"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in v
o
n
Z
w
eigbergk
reba
s
e:
use
@
{ups
t
rea
m
}
if no
u
pstream specifi
e
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase -i: remo
v
e unneces
s
ary state rebas
e
-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase -i: don't
r
ea
d
un
u
sed variable
p
reserve_merge
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in v
o
n
Zweigb
e
rgk
git-rebase--am:
r
em
o
v
e
u
nnecessary --3way o
p
ti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n v
o
n
Zweigberg
k
rebase -m: don't print exit
code 2
w
hen merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
-
m: re
m
ember allow_r
e
rere_
a
u
to
u
pdate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwei
g
b
e
rgk
rebase:
r
e
member s
t
rategy a
n
d st
r
ateg
y
option
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Zweigbergk
rebase:
r
e
member verbo
s
e option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
be
r
gk
r
e
base: extract
c
ode for
w
r
iting basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
r
ebase: fact
o
r out sub com
m
a
nd handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: make
-
v a tiny bit
m
ore verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwei
g
b
e
rgk
rebase -i: align variabl
e
n
ames
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Z
w
eigberg
k
rebase
:
show consistent conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase: extract am code to new so
u
rce
f
ile
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
vo
n
Zw
e
igbergk
r
ebase: e
x
tract
m
erge c
o
d
e to new sourc
e
fil
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: remove
$b
r
anch as synonym for
$orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
eigbergk
re
b
ase: factor out
r
efere
n
ce parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
re
b
ase -i
:
support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
von Zweigbergk
re
b
a
se: reorder v
a
lidation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
e
rgk
rebase: f
a
ctor out
call to pre-reba
s
e hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Zweigbergk
reba
s
e -i: remove now u
n
necessary directory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
ig
b
ergk
r
ebase:
f
a
ctor
out c
l
ean
wo
r
k
tree
c
h
e
ck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zw
e
igbergk
rebase: factor out command line option p
r
ocessing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zwei
g
bergk
re
b
ase: a
l
ign
v
ari
a
b
l
e content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigber
g
k
re
b
ase: a
l
ign var
i
able nam
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von Zweigbergk
r
e
base: stricter
c
h
eck of stan
d
al
o
ne
sub c
o
mm
a
nd
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zweigbergk
r
eb
a
se: act on comman
d
line outside parsing l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase: improve detection o
f
rebase in progr
e
ss
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zw
e
igbergk
rebase:
r
emove unused reba
s
e s
t
a
te 'pr
e
v_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
r
ead state outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
rebase: refa
c
t
o
r rea
d
ing of
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
reba
s
e: clearer names for dir
e
ctory v
a
riables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Marti
n
v
on Zweigb
e
r
g
k
c
o
mpletion: a
d
d missin
g
co
n
fi
g
uration v
a
riables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigb
e
r
g
k
Use reflog in 'pull --rebase
.
f
oo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von
Z
weigbe
r
gk
r
e
base
:
only show s
t
at if con
f
igure
d
to tr
u
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigberg
k
rebase --
a
b
o
r
t: do not update branc
h
r
ef
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Mart
i
n von Zweig
b
ergk
re
b
ase: s
u
pport
--verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Ma
r
tin von Zweigbergk
Documenta
t
ion/git-pu
l
l: clarify c
o
nfigur
a
tion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
a
r
tin von Zweigbergk
rebase -
X
:
d
o not
clobbe
r
strat
e
g
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree