repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with 1.7.11.2
2012-06-27
Mar
t
in
v
o
n
Zweigbergk
add test
case for re
b
ase of empty commit
commit
|
commitdiff
|
tree
2011-12-12
M
artin v
o
n Zweigb
e
rgk
t3401: use t
e
st_commit
i
n
setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Z
w
eigber
g
k
t
3
401: moder
n
i
ze st
y
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Z
w
e
i
gbergk
am:
d
on't persist
k
eep
c
r flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
we
i
gbergk
remote: only upda
t
e remo
t
e
-tr
a
cking bran
c
h if
u
p
d
ating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remot
e
rename
:
wa
r
n w
h
en refsp
e
c was not
upd
a
ted
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
arti
n
von Zweigbergk
remo
t
e: "rename o foo" sh
o
uld not rename ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in von
Zwe
i
gbe
r
gk
remot
e
: write
c
o
r
rect
fetch spec when
renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
g
itk:
S
h
ow modified files with
s
epa
r
ate
w
or
k
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Z
w
eigbergk
gi
t
k: Simplify calcul
a
tion of gitd
i
r
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rti
n
v
o
n Z
w
e
i
g
b
ergk
gitk: Run 'gi
t
rev-parse --git-dir'
only o
n
ce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Zweig
b
ergk
gitk: Pu
t
tempo
r
a
ry
directory
i
nside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbe
r
gk
git
k
:
Fix "Exte
r
nal diff" with separate work tr
e
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
i
n
von Zwei
g
bergk
gitk:
Fix "blam
e
paren
t
commit"
with separa
t
e work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweigbergk
gi
t
k
:
Fix "show or
i
g
i
n o
f
this line"
w
i
t
h separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
i
n
von
Zweigbergk
gitk: Fix file highlight w
h
en ru
n
in subdire
c
tory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin
von Zweigbergk
reba
s
e: clarify "restore the ori
g
inal
b
ranch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
M
a
rti
n
v
on Zweig
b
e
rgk
Documentatio
n
:
use [verse] for SYNOPSIS
s
ec
t
ions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigberg
k
d
i
ffcore-rename: don't cons
i
der
u
nmerged path as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Z
w
e
i
gb
e
rg
k
rebase: def
i
n
e
o
pti
o
n
s
in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Marti
n
vo
n
Zweigbergk
M
akefile: do not
i
nsta
l
l
sourced rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von
Z
weigbergk
mergetool: don't sk
i
p
modify/
r
emove
c
onflic
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigb
e
rgk
rerer
e
"
remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zweigbergk
reba
s
e: use @{upstream}
if
n
o
upstream
speci
f
ied
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
igbe
r
gk
rebase -i: rem
o
ve unn
e
cessary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigberg
k
rebase -i: don't read unuse
d
variable preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
g
i
t
-
r
ebase--am: remove unn
e
cessa
r
y --3w
a
y
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebas
e
-
m: don't print
exit code 2 when merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zwe
i
gbergk
rebase -m: r
e
memb
e
r
allow_rere
r
e_autoupdate op
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigb
e
rgk
rebase: rem
e
mb
e
r strategy and
strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
igbergk
rebas
e
: remem
b
e
r
v
e
rbo
s
e option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von
Z
weigbergk
rebase: extract code for
writing basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zweigbergk
re
b
ase: factor out sub comma
n
d handlin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zw
e
igbergk
rebase: make
-
v
a
ti
n
y
bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
g
k
rebase -i
:
ali
g
n v
a
r
iable
n
a
m
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von Zweigbe
r
gk
r
e
b
a
se: show consis
t
ent conflic
t
resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
r
g
k
r
e
bas
e
:
extract a
m
code to new
source f
i
le
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Zweigbe
r
gk
rebase: extra
c
t merge code
t
o
new s
o
urce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
r
ebase: remo
v
e $br
a
n
c
h
as synonym for $or
i
g_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in vo
n
Z
w
ei
g
bergk
rebase: factor o
u
t refer
e
nce
parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweig
b
e
rgk
rebase -i: su
p
po
r
t --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
r
gk
rebas
e
: reorde
r
validation st
e
ps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zweig
b
ergk
rebas
e
:
f
a
ctor ou
t
call to pr
e
-
rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: remov
e
now unnecessary directory check
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
i
n
von Zweigbergk
rebase: factor out
clean work tree
c
h
eck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebase
:
f
a
c
t
or out command line
opt
i
on pro
c
essi
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
g
k
reba
s
e
:
ali
g
n v
a
ria
b
le content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zw
e
igbergk
rebase
:
align
variabl
e
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
s
tr
i
cter c
h
e
c
k of s
t
andalone su
b
comman
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigber
g
k
rebase: act
o
n com
m
and line
o
u
tside pa
r
sing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
eigbergk
rebase: impro
v
e de
t
e
c
t
ion of
rebase in p
r
ogress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n v
o
n
Zweigbe
r
gk
rebase: remove unu
s
ed r
e
ba
s
e
state '
p
rev
_
head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
e
i
g
bergk
r
e
base: read st
a
te
outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigb
e
r
gk
r
e
ba
s
e: refacto
r
reading of st
a
te
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebas
e
: cl
e
are
r
n
ames
for
d
ir
e
ctory var
i
ables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
M
ar
t
in von Zweigbergk
c
o
m
pletion:
a
dd miss
i
ng
con
f
iguration variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
tin von Zweigber
g
k
Use reflog in 'pull
-
-rebase
.
f
o
o'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin v
o
n
Zweigbergk
rebase:
only show stat if
c
onfigured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
artin von Zwei
g
bergk
rebase --abort: do not update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Z
w
eigber
g
k
r
ebase
:
s
u
p
p
ort --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zweigbergk
Doc
u
menta
t
ion/git-p
u
ll: clarify c
o
nfigu
r
at
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
arti
n
v
o
n
Z
w
eigbergk
rebas
e
-X: do not cl
o
b
b
er str
a
tegy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree