repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'rt/maint-clone-single'
2012-09-18
Marti
n
v
on
Zweigbergk
rebase usage: subcommands can not be combined with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
art
i
n
v
on Zweigbergk
ch
e
rry-pi
c
k
/
rev
e
r
t
:
respect o
r
de
r
of revisions to p
i
ck
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zwe
i
gber
g
k
d
e
monstrate bro
k
en
'git ch
e
rry
-
p
i
ck three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Z
w
eigbergk
t
e
a
ch
l
o
g
-
-no-walk=unsorted, which avoids sort
i
ng
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
M
a
rtin von Z
w
eigbergk
add tests f
o
r 'git
reba
s
e --keep
-
e
mpty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Ma
r
tin vo
n
Z
w
eigberg
k
cherry: r
e
move redundant ch
e
ck for merge commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
a
rtin von
Z
we
i
gbergk
cherry: don't set ignored r
e
v_inf
o
options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von Zweigbergk
r
e
move unnecessary param
e
ter f
r
om get_patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
M
a
rtin von Zwei
g
b
ergk
add test case for
r
ebase of empty comm
i
t
commit
|
commitdiff
|
tree
2012-06-26
Martin von Z
w
eigbe
r
gk
am: don't call
mailinfo if $re
b
asi
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
artin von Zw
e
igbergk
am --reb
a
sing: get patch
b
ody
f
ro
m
commi
t
, not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von
Zweigbergk
r
ebase --ro
o
t:
print usage o
n
too m
a
n
y
a
r
gs
commit
|
commitdiff
|
tree
2012-06-26
Martin
von Zweigbergk
reb
a
s
e
:
don
'
t sou
r
ce gi
t
-sh
-
setu
p
twic
e
commit
|
commitdiff
|
tree
2011-12-12
Marti
n
von Zweigbe
r
gk
t3401: u
s
e test
_
commit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigbe
r
gk
t3401: mod
e
rnize
s
tyle
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zw
e
i
gbergk
am:
d
o
n'
t
per
s
i
s
t
keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigberg
k
remote: only u
p
date remote-tra
c
k
ing branch if upd
a
ting
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
artin von Z
w
eigbergk
r
e
mote
r
ename: warn when refsp
e
c w
a
s not
u
pd
a
ted
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
weig
b
ergk
rem
o
te: "rename o foo
"
should not
renam
e
ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote: write correct
fetch spec
w
h
e
n rena
m
ing
r
e
mote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweigb
e
r
gk
gitk: S
h
o
w
mod
i
f
i
ed files with sep
a
rate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von Zweigber
g
k
gitk: Simp
l
i
f
y
calc
u
latio
n
of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigbergk
gitk
:
Run 'git
rev-parse --git-dir
'
only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbe
r
gk
gitk: Put tempo
r
ary d
i
rectory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zweigb
e
rgk
git
k
: Fix "External diff" with sep
a
ra
t
e
work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin
v
on Zweigbergk
g
itk: Fix "blame parent commit"
wi
t
h separate
wor
k
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigber
g
k
g
itk: Fix "show or
i
gin of this line" w
i
th s
e
p
arate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zwe
i
gbergk
git
k
: Fix file highli
g
h
t whe
n
r
u
n
in sub
d
ir
e
ctory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin
v
on Zweigbergk
rebase: cla
r
ify "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
Zweigbergk
Documentation: use [verse] for SYNOPSIS section
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
artin vo
n
Zweigbergk
diffco
r
e-rename:
d
o
n't consid
e
r unmerged path
as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Ma
r
t
i
n
v
o
n Zweigbergk
re
b
a
se: define options
i
n
OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von
Zweigbergk
Makefile: do not install
source
d
r
ebas
e
scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
ar
t
in von Zweigbergk
merg
e
tool: don't s
k
ip mo
d
i
fy/
r
e
move conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigbergk
rerere "rem
a
ining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebase: use @
{
u
p
stream} if
no
u
p
stream sp
e
cifie
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
on Zweigberg
k
r
e
base -i: re
m
ove unnecessary state
rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n vo
n
Zwei
g
bergk
r
e
b
ase -
i
: d
o
n
'
t
read unused v
a
riable p
r
e
serve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
weigbergk
git-rebase--am:
r
emove
u
nnec
e
ss
a
ry --3way op
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase
-m:
d
on't
p
rint exit code 2 when me
r
ge
fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von
Z
weigbergk
rebase -m: remember allow_rerere_autoup
d
a
t
e option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigbergk
rebas
e
: remember s
t
r
at
e
gy and
strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase: remember verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von Z
w
eig
b
ergk
r
e
ba
s
e:
e
xtrac
t
code
for
wr
i
ting basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gberg
k
reba
s
e
: factor out sub
c
o
m
mand ha
n
dling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weigbergk
rebas
e
:
make
-
v a tiny bi
t
more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
r
gk
r
e
ba
s
e
-i: alig
n
vari
a
ble nam
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
re
b
ase:
show cons
i
stent conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase:
extract am code to new
sou
r
ce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zw
e
igbergk
r
e
base: extract merge c
o
de to new
source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n Zweigbergk
rebase: r
e
move $branch as
s
ynon
y
m for
$
ori
g
_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zw
e
i
gbergk
rebase: factor
o
ut re
f
eren
c
e
p
a
rsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
on
Z
weigber
g
k
rebase
-i:
s
upp
o
rt --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebas
e
: reo
r
der vali
d
ation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase:
factor ou
t
call
to pre-re
b
a
se hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigberg
k
r
e
base
-
i: re
m
ove n
o
w unnece
s
sary direct
o
ry checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
von Zwei
g
b
ergk
rebase
:
factor o
u
t cle
a
n work
tree c
h
eck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
r
ebase:
fa
c
tor
o
ut
command li
n
e
option p
r
ocessing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zw
e
ig
b
erg
k
reba
s
e: align
variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
r
ebase: align
v
ariable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweig
b
e
r
gk
re
b
ase: stricter che
c
k
of s
t
andalone su
b
c
ommand
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweig
b
ergk
rebase:
a
ct on command line ou
t
s
ide parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
weigber
g
k
reb
a
se
:
improve det
e
ction
o
f
rebase in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
r
ebase
:
remove unused rebase state 'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von
Z
weigbergk
rebase: read
state
outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigbergk
reba
s
e:
refactor reading
of
s
tate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Zwei
g
bergk
reb
a
se: c
l
eare
r
names
f
or directory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Mar
t
in von
Z
w
e
igbergk
completion: add m
i
ssing configurat
i
on variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mart
i
n
von Zwei
g
berg
k
Use reflog
in
'
pu
l
l --rebase
.
foo
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin v
o
n Zweigb
e
rgk
rebase: on
l
y
show stat
if
c
onfigured to tr
u
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Mar
t
in
von Z
w
eigberg
k
rebase --abort: do not update bran
c
h
r
e
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin
von Zweigber
g
k
reb
a
se:
s
upport --verif
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zweigbergk
Docume
n
tation/git-pull:
c
larify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin v
o
n Zweig
b
ergk
rebase
-X: d
o
not cl
o
bber
s
trategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree