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
Merge branch 'er/stop-recommending-parsecvs'
2012-12-20
M
a
rt
i
n
v
on Zweig
b
ergk
one
w
ay_m
e
rg
e
(): only lstat() w
h
en told
to
u
pdate
w
ork
t
ree
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
M
artin
v
on Z
w
eigbergk
r
ebase usage: subcommand
s
can not b
e
c
o
mbined
w
ith -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mar
t
in von
Z
weigbergk
cherry-pick
/
r
e
vert: respect order of
revisions to pi
c
k
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
artin von
Zweigbergk
demonstrate bro
k
e
n
'git cherry-pick three o
n
e
two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Ma
r
t
i
n von Zweigb
e
rgk
teach log
-
-no-walk=unsorted, which avoid
s
sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Marti
n
von Zweigbergk
add tes
t
s for 'git
r
ebase --k
e
e
p
-
empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Mar
t
i
n
von Zw
e
ig
b
e
r
gk
cherry:
remo
v
e r
e
dundant check fo
r
merge
c
ommi
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Ma
r
tin v
o
n Zweigb
e
r
gk
c
herry: d
o
n't s
e
t ignor
e
d rev_i
n
fo op
t
ions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
M
a
rtin von Zweig
b
ergk
remove unnecess
a
ry p
a
rameter
f
r
om get_patch_
i
ds()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Mart
i
n von Zw
e
igbergk
add
t
est case for re
b
ase of
empty com
m
it
commit
|
commitdiff
|
tree
2012-06-26
Martin v
o
n Zwei
g
bergk
am: do
n
't call mailinfo
i
f $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von
Zwei
g
bergk
am --rebasing: get patch b
o
dy from commit
,
not fro
m
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin v
o
n
Z
w
e
ig
b
ergk
r
e
ba
s
e
--root:
print usage on too m
a
ny ar
g
s
commit
|
commitdiff
|
tree
2012-06-26
Marti
n
von Zwei
g
bergk
rebase:
d
on't sou
r
c
e
git-sh-s
e
t
up twic
e
commit
|
commitdiff
|
tree
2011-12-12
Martin vo
n
Zw
e
igbergk
t3401: use tes
t
_commit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zwe
i
g
b
ergk
t3401: moderni
z
e style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin
von Zweig
b
ergk
am: don't persist keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
i
n v
o
n
Zweigbergk
r
emote:
only update remote-tracking
b
r
an
c
h if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote rename: warn when
r
e
f
spec was not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
von Zweigbergk
remote: "rena
m
e o foo" sh
o
ul
d
not
r
e
n
a
m
e
re
f
"or
i
gin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in von
Zweigbergk
r
e
m
ote: write co
r
rect fetch
spec when renaming remo
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rti
n
von Zweigbergk
gitk: Show modified
f
iles with
s
epara
t
e work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin v
o
n Zw
e
igbergk
g
itk:
S
implif
y
calculation of
g
itdi
r
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igbergk
gitk: Run 'git rev-pars
e
-
-git-dir'
o
nly once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
ar
t
in von Zweigbergk
git
k
: Put temporary directo
r
y inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwei
g
be
r
g
k
gitk: Fix "Exte
r
nal di
f
f" wi
t
h
s
e
parate work
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigber
g
k
gitk
:
Fix "blam
e
pare
n
t
commit" with separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigb
e
rgk
gitk: Fix
"show origin
of this line" wi
t
h separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Z
w
eigbergk
gitk: Fix f
i
le hig
h
light
when run in subdi
r
ectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zwe
i
gb
e
rgk
r
ebas
e
: clarify "restor
e
the
o
rigina
l
branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zwe
i
gbergk
Documentation: use [verse] for SYNOPSIS s
e
ctions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigb
e
r
g
k
d
iffcore-
r
e
n
ame: do
n
't c
o
nsider unmerged pat
h
as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Mar
t
in v
o
n Zweigbergk
rebase: d
e
fine options in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von
Zweigbergk
Makefi
l
e
: do not
i
ns
t
al
l
sourced reba
s
e s
c
ripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mart
i
n von
Z
weigbergk
mergetool: don't
s
kip
m
odify/rem
o
ve con
f
licts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
a
rt
i
n v
o
n Zweigberg
k
rerere "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
re
b
ase: use @{upstream} if no ups
t
ream
s
pe
c
ified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase -i: remove unnecess
a
r
y
s
tate rebase-ro
o
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
r
eba
s
e
-
i: don't read unused variabl
e
preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigberg
k
git-rebase--
a
m: rem
o
ve unnecessa
r
y --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigber
g
k
rebase -m
:
don't prin
t
exit code 2
wh
e
n
merge fa
i
ls
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
o
n
Zweigbergk
rebase -
m
: remember
a
l
l
ow_rerere_aut
o
update option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von Zweigb
e
rg
k
rebase: rem
e
mb
e
r str
a
t
e
gy a
n
d
s
trategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
reb
a
se: remember verbose opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigb
e
rgk
r
e
base: extract code for writing basi
c
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n vo
n
Zw
e
igb
e
rgk
rebas
e
: factor ou
t
s
u
b co
m
mand handling
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: m
a
ke -v
a
tiny bi
t
more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n
v
on Zwe
i
gber
g
k
rebase -i
:
alig
n
variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
eigb
e
rgk
rebas
e
: show consi
s
t
ent conflict resoluti
o
n
hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: ext
r
ac
t
am
c
od
e
to
new sour
c
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Z
weigbergk
rebase: extract merge code to new
s
o
urce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zwe
i
gbergk
rebase: rem
o
v
e
$
b
r
anch
as synony
m
f
or
$ori
g
_
h
ead
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
reb
a
se: factor out reference p
a
rs
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
von Zwei
g
bergk
rebase -i:
support --
s
tat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase: reorder va
l
idation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
v
on Zweigbergk
rebase: facto
r
out call to
p
re-rebase
h
ook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwe
i
g
b
e
r
g
k
reb
a
se -i: r
e
mov
e
now unne
c
essar
y
directory ch
e
cks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase:
f
acto
r
out clean
work tr
e
e
check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigberg
k
reb
a
se: fact
o
r
out co
m
m
a
nd
line option processi
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Zweigbergk
rebase: al
i
gn variable
c
ontent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwe
i
g
b
ergk
rebase: align vari
a
bl
e
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
v
o
n Zweigbe
r
gk
r
ebase: stricter check of s
t
andalone sub com
m
and
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n
von Zweigbergk
re
b
ase: act on com
m
and lin
e
out
s
id
e
par
s
ing l
o
o
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von
Z
weigbergk
rebase: improv
e
d
e
tection
o
f rebase
i
n progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweigberg
k
rebase: remove unused re
b
a
s
e s
t
a
te 'prev_hea
d
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebase:
r
ead state outside l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase:
refactor reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwei
g
b
e
rgk
rebase: clearer names for direc
t
ory
v
a
riables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Marti
n
von Zweigbe
r
gk
co
m
pletion: add
missing configuration variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin
v
o
n
Z
weigbergk
Use
reflog
in 'pull --re
b
ase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
reba
s
e: only show
s
tat i
f
c
o
nf
i
gure
d
to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
a
rtin von Zweigberg
k
reb
a
se --abort: do not update branc
h
re
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweigb
e
rgk
rebase:
support --v
e
rify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zwe
i
g
berg
k
Documentation/git-p
u
ll: clarify
c
onfiguration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin
v
on Zweigb
e
rgk
rebase -X: do not cl
o
bber strate
g
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree