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
Merge branch 'rs/ipv6-ssh-url' into maint
2012-06-27
Martin von Zweigb
e
rgk
add tes
t
c
a
se for rebase of empty co
m
m
i
t
commit
|
commitdiff
|
tree
2011-12-12
Martin vo
n
Z
w
eigbergk
t3401: use tes
t
_
com
m
it in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von
Zweigbergk
t3401: moder
n
iz
e
s
t
y
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Mart
i
n von Z
w
eigbergk
a
m
:
do
n
't persist keepcr fla
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
weigbergk
remote: only u
p
dat
e
r
e
mot
e
-tracking br
a
nch
i
f
updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
artin von Zweigbergk
remote ren
a
me:
warn whe
n
re
f
s
p
ec
w
a
s
n
o
t u
p
dated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweig
b
er
g
k
remote: "re
n
ame o foo" s
h
ould not rename
ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Zweigbergk
remote: wr
i
te corr
e
c
t fetch spec when ren
a
mi
n
g re
m
ote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igbergk
git
k
: Show modified fil
e
s
w
i
th separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von
Zweigbergk
gitk: Simpl
i
fy
c
alculation
o
f gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in von Zweigbergk
gitk: Run 'git
rev-parse --git-dir' only onc
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n
Zweig
b
er
g
k
gi
t
k: Put temp
o
rary directo
r
y
i
nside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zweigbergk
git
k
: Fix "External diff"
with s
e
parate work t
r
ee
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von Zweigbergk
gitk: Fix "blame parent commit" with separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von Zw
e
igberg
k
gitk: Fix "show origin o
f
this
lin
e
" wit
h
s
eparate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von
Z
weig
b
erg
k
gitk: Fix
f
il
e
highlight when run in
s
ub
d
irectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von
Zweigber
g
k
rebas
e
: clarify "re
s
tore the orig
i
nal branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
M
artin von Zweig
b
e
rgk
D
o
cument
a
t
i
o
n
:
use
[v
e
rse] for SYNO
P
S
IS
sec
t
ions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von
Zweigberg
k
diffcore-rename: don't consider unmerged path as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zweigbergk
rebase: define option
s
in OPTIONS
_
SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
a
rtin von Zweig
b
er
g
k
Makefil
e
: do not install sourced
rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Marti
n
von Zweigbe
r
gk
merget
o
ol
:
don't skip mo
d
ify/remove conflict
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
a
rtin
v
o
n
Zweigbergk
rerere "r
e
mai
n
i
ng"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
rebase: use @{upstream} if no upstream specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase -i: remove un
n
eces
s
ar
y
state
r
ebase-
r
oot
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zw
e
igbergk
rebase -i: don
'
t re
a
d
unused
variable
preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
von Zweigbe
r
gk
git-reba
s
e
-
-am: remove
u
nnecessary --
3
wa
y
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase
-m: don't print exit code 2 w
h
en merge fa
i
ls
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
ig
b
ergk
r
e
base -m: remem
b
er
allow_rerere_autoupdate opt
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
w
eigbe
r
gk
r
ebase: remem
b
er st
r
ategy
a
nd
s
trategy option
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
von Zweigbergk
rebase: remember ve
r
bose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
s
e: extract cod
e
for writi
n
g bas
i
c state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
vo
n
Zweigbergk
reb
a
se: f
a
cto
r
out sub command hand
l
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
ergk
rebase: make -
v
a tiny bit mor
e
ver
b
ose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Z
w
eigbergk
rebase -i: al
i
g
n vari
a
b
l
e names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase: show co
n
s
i
stent co
n
f
l
ict res
o
luti
o
n hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
weigbergk
rebase:
e
xtract am c
o
de to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: extract merge code
t
o
new so
u
r
c
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
von
Z
weigbergk
rebase
:
remove
$
bran
c
h
a
s
syno
n
y
m for $or
i
g_
h
e
a
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase: factor
o
ut reference p
a
rs
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Zweigbe
r
gk
rebase
-i: suppor
t
--stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweigbergk
rebase:
r
e
ord
e
r validation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out call t
o
pre-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase -i: re
m
ove now u
n
necessary directory che
c
ks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n v
o
n Zwei
g
bergk
r
ebas
e
: factor out clean wo
r
k tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: f
a
ctor out command line
option pro
c
essing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
b
ase:
a
lig
n
variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigb
e
rgk
reb
a
se: align varia
b
le
n
ames
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbe
r
g
k
reb
a
se: st
r
icter check of standa
l
one
s
ub
comma
n
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase
:
act on c
o
mmand line out
s
ide parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
w
e
igbergk
r
e
b
ase: improve detec
t
ion of rebase
in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase: re
m
o
ve u
n
u
sed rebase state 'prev
_
h
e
ad'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: read state
o
ut
s
ide loo
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwe
i
gbergk
rebase:
refactor reading
of stat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zw
e
ig
b
ergk
rebase: clearer names for dir
e
ct
o
r
y variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
M
a
rtin
v
on Zweigberg
k
completi
o
n: add m
i
ss
i
ng configurat
i
o
n
variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin
v
on Zweigbergk
U
se reflog in
'
p
ull --re
b
a
se
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
artin von Zweigbergk
reba
s
e: only s
h
ow stat if configured t
o
true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin v
o
n Zweigbergk
re
b
ase --abor
t
:
do not updat
e
bran
c
h
ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
a
rt
i
n vo
n
Zweigbe
r
gk
rebas
e
: support --ver
i
fy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zweigbergk
D
o
cum
e
ntatio
n
/gi
t
-p
u
l
l
: clarify configu
r
ation
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbergk
reba
s
e -X: do n
o
t c
l
obbe
r
stra
t
egy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree