repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
add test case for rebase of empty commit
2012-06-27
Martin von Zweig
b
ergk
a
dd test cas
e
for
r
ebase of empty co
m
mit
commit
|
commitdiff
|
tree
2011-12-12
Marti
n
von Zwei
g
berg
k
t3401: use
test_c
o
mmit in s
e
tu
p
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-12-12
Martin vo
n
Zweigbergk
t3
4
01: modernize s
t
yle
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zweigb
e
r
g
k
am
:
don't
p
e
r
sist keepcr flag
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
wei
g
bergk
remote: o
n
ly
update
remote-tracking branch if upd
a
ti
n
g
.
.
.
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-09-12
Martin von Z
w
eigbergk
remote
r
ename: warn
wh
e
n r
e
fspec was not
updated
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote:
"
ren
a
me
o
fo
o
" shou
l
d not ren
a
me ref
"
origi
n
.
.
.
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-09-12
Martin
von
Zwei
g
b
ergk
r
e
m
o
t
e:
w
rit
e
correct f
e
tc
h
s
pe
c
w
h
e
n
r
ena
m
ing
r
emot
e
.
.
.
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zweigbergk
gitk: Show
modified files with separate w
o
rk tree
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Martin
von
Zweigbergk
gitk: S
i
mplify calculation of gi
t
dir
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Run 'g
i
t rev-parse --git-dir' on
l
y once
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von
Z
weigbergk
gitk: Put tempor
a
ry
d
i
rectory
i
ns
i
de
.
git
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zweigbergk
gitk: Fix "External diff" with sep
a
rate work tree
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbe
r
gk
gitk: Fix "blame paren
t
c
om
m
it
"
with sepa
r
ate
wo
r
k
.
.
.
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zwei
g
bergk
gitk: Fi
x
"show origin of this line
"
with separa
t
e
.
.
.
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von Zwe
i
gbergk
gi
t
k: Fix file highlight when r
u
n in subdirecto
r
y
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-14
M
artin von Z
w
e
i
g
b
ergk
r
ebase: clar
i
fy "re
s
tore the original branch"
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-06
Mar
t
in
von Zw
e
igbergk
D
o
cum
e
ntation: use
[verse] for SYN
O
PSIS
s
ections
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-03-24
Martin
von Zweigberg
k
diffcore-ren
a
me: don'
t
consider unmerged path as
sourc
e
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-03-05
Martin von
Zweigbergk
rebase: define options i
n
OPT
I
ONS_
S
PEC
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-25
M
art
i
n von Zwei
g
ber
g
k
M
a
kefile: d
o
not insta
l
l
sourced reb
a
s
e scripts
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-16
Marti
n
von Z
w
eigbergk
mergetool: don't skip m
o
dify/remove
c
o
nflict
s
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-16
Ma
r
tin von Zwei
g
b
e
rgk
rere
r
e
"remaining"
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zwei
g
bergk
reb
a
se: u
s
e
@{up
s
tr
e
am} if no upstream sp
e
ci
f
ied
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
-i: remove
unnecessary state re
b
ase-root
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase -i: don
'
t
read unused variable preserve_merges
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
vo
n
Zw
e
igber
g
k
gi
t
-rebase-
-
a
m
: rem
o
ve unnecess
a
ry --3
w
a
y
o
ption
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
se -m: don
'
t
p
ri
n
t ex
i
t co
d
e 2
when merge fails
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Z
w
eigb
e
rgk
re
b
ase -m: rem
e
mber allow_rerere_au
t
oup
d
ate option
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebase: remember strategy
a
nd s
t
rate
g
y
o
ptions
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
igbergk
rebase: r
e
memb
e
r
verbos
e
o
p
t
ion
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
i
g
bergk
rebase:
e
x
tra
c
t co
d
e
fo
r
w
riting basic state
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
ber
g
k
rebase: factor
o
u
t
s
ub c
o
mmand handlin
g
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebas
e
:
make -v
a
t
i
ny
bit
more verb
o
se
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n
Z
w
eigberg
k
rebase -i: align variabl
e
names
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zweigbergk
re
b
ase: show
consistent con
f
l
i
ct r
e
s
o
lut
i
on
h
int
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zwe
i
gbergk
rebase: extract am code
t
o
n
e
w sou
r
ce file
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase: extract merge code to new sourc
e
fi
l
e
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigb
e
rgk
re
b
ase: remove $b
r
anch a
s
s
y
nonym
f
or $orig_head
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
r
e
ba
s
e -
i
: support --
s
tat
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Zwei
g
berg
k
rebase: factor out call to pre
-
re
b
ase hook
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwe
i
gb
e
rgk
r
e
b
a
s
e: factor ou
t
clean wor
k
tr
e
e check
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
e
i
g
bergk
r
ebase: fa
c
tor out refer
e
nce
p
arsi
n
g
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebas
e
: r
e
order validation steps
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zw
e
i
gbergk
reba
s
e -i: remove now unnec
e
ss
a
ry directory checks
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
erg
k
rebase: fact
o
r
out comm
a
nd line option pro
c
essing
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase: a
l
ign va
r
ia
b
le
c
ontent
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von Zweigbergk
r
eb
a
se:
a
lign varia
b
le
n
a
me
s
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
r
e
base: stri
c
ter check of standal
o
ne sub co
m
mand
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigb
e
r
g
k
rebase:
a
ct on command line outside
p
a
r
sing loop
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
g
k
re
b
a
se: improve detection of reba
s
e in p
r
ogress
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase: r
e
move unus
e
d rebase stat
e
'prev
_
head'
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebase: read state outside loop
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: refac
t
or reading
o
f sta
t
e
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on Zwei
g
berg
k
re
b
ase:
cle
a
r
e
r na
m
e
s
fo
r
directo
r
y variables
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-12-21
Mart
i
n von Zweigbergk
completion: add missing configuration variable
s
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigb
e
rgk
Us
e
reflog in 'pull --rebase
.
foo'
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-29
Martin von
Z
weigbergk
rebase:
o
n
ly show sta
t
if config
u
red to true
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-24
Marti
n
v
o
n Zw
e
igbe
r
g
k
reba
s
e
-
-abort: do not update b
r
a
n
c
h
ref
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-23
Martin
v
on Zweigberg
k
re
b
ase
:
support --
v
eri
f
y
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-17
M
artin
v
on
Zweigbergk
Documentati
o
n/git-pull: clarify configuration
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-10
M
a
rtin von Zwe
i
gber
g
k
rebas
e
-X: do no
t
clobber strategy
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree