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 'js/compat-mkdir'
2012-08-30
Mar
t
in von Zw
e
igbergk
cher
r
y-p
i
ck/r
e
vert: r
e
s
p
ect order
o
f
r
evisions to
pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Ma
r
tin
v
on Zweig
b
ergk
demonstrate b
r
oken
'git ch
e
rry-pick three one t
w
o'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
a
rtin von Zweigbergk
teach log --no-
w
alk=unsorted, which av
o
ids sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Zweig
b
er
g
k
a
d
d
tests for 'git rebase --keep
-
empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigb
e
rgk
cherry: r
e
move redundant c
h
eck for merge commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin
vo
n
Zwe
i
g
b
ergk
cherry: don'
t
set
i
g
n
ore
d
rev_i
n
fo options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
M
artin von Zweigbergk
remove unnecessary p
a
rameter from get_p
a
tch
_
ids
(
)
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Ma
r
t
in
v
on Zweigbergk
add te
s
t case f
o
r reb
a
se o
f
empt
y
commit
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin
v
on
Zweigbergk
am:
don't
call mailinfo if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mar
t
in von Zweigber
g
k
am --re
b
asing: get
patch bod
y
from commit,
n
ot from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin v
o
n Zweigbergk
reba
s
e --root
:
p
r
int usage on too man
y
args
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
on Zwe
i
gbergk
rebase: don't source git-sh-
s
etu
p
t
wice
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigbergk
t
3
4
0
1:
u
s
e test_
c
o
m
mit
in
s
e
tup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zwe
i
gb
e
rgk
t3401: modernize
style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zweigbergk
am: don't p
e
rsist keep
c
r flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in von Zweigbergk
r
em
o
te: onl
y
updat
e
remot
e
-tracking
branc
h
if
updati
n
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
on Zweigber
g
k
remote rename: war
n
when re
f
spec
was not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
on Zweigbergk
remote: "r
e
nam
e
o fo
o
" s
h
ould
not rename ref "
o
rig
i
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
r
ti
n
von Zweigbergk
remote: write correc
t
f
e
tch
spec whe
n
renaming remo
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zweig
b
ergk
gitk:
S
h
ow mo
d
ified files wi
t
h
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 calcula
t
ion
of
g
i
tdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zwe
i
gbergk
gitk: Run
'
gi
t
rev-p
a
r
se
-
-git-dir'
onl
y
once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin vo
n
Zweigbergk
g
i
t
k
: Put
temporary d
i
r
e
c
t
ory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
g
i
tk: Fix "External diff" w
i
th separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zweig
b
ergk
git
k
:
Fi
x
"
bla
m
e
parent commit" with se
p
arate
w
ork
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
r
tin
von
Zwei
g
bergk
git
k
: Fi
x
"sh
o
w origin of this l
i
ne" with
separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
t
i
n vo
n
Zweigbergk
gi
t
k: Fix file highlight when ru
n
in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zw
e
igbergk
reb
a
se: c
l
arify "re
s
tore t
h
e
original
b
ranch
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin v
o
n
Zweigb
e
rgk
Docu
m
enta
t
ion: u
s
e [verse]
f
o
r
SYNOPSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin
v
on Zweigbergk
d
iffcore-rename
:
don'
t
consider unmer
g
ed path as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
M
a
rtin von
Zweig
b
ergk
rebas
e
:
define options
in
O
PT
I
ONS_S
P
EC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Ma
r
t
i
n
von Zwe
i
gberg
k
M
akefile: d
o
not
i
nst
a
ll sourced rebas
e
sc
r
i
pts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mart
i
n von Zwe
i
gberg
k
merg
e
too
l
:
d
o
n'
t
skip mod
i
f
y/
r
emove confli
c
ts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigbergk
rerere "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zw
e
igb
e
r
g
k
rebase:
u
se @{upstr
e
a
m
}
if n
o
u
p
stre
a
m
specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von
Z
weigber
g
k
rebase -i:
r
emove unnecessary state
r
e
base-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
reb
a
se
-
i
:
don
'
t read unus
e
d variable pre
s
erve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
we
i
gbergk
git-reb
a
se--am
:
r
emove
u
nnecess
a
ry --3way opt
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
r
ebase -m: don't print exit code 2 when mer
g
e
f
ai
l
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigb
e
rgk
rebas
e
-m: reme
m
ber allow_rer
e
re_autou
p
date option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigber
g
k
rebase: remember strategy an
d
strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
se:
re
m
emb
e
r ve
r
bose opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
rebase: extract code for writing
b
asic stat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Z
we
i
gbergk
rebase: factor ou
t
s
u
b
command handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase: make -v a tiny bit more v
e
rbo
s
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweigbergk
rebase -i: al
i
gn variab
l
e
n
a
mes
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
g
k
r
e
base: show cons
i
stent c
o
nfl
i
ct reso
l
ut
i
on hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Z
w
eigbergk
rebase: extrac
t
am code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eig
b
e
rgk
r
ebase: extra
c
t merge co
d
e t
o
new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
r
e
base: remove $branch as synonym
for $orig
_
head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zwe
i
gbergk
re
b
ase: fa
c
tor
out reference p
a
rsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von Zweigb
e
r
g
k
rebas
e
-i: support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
weigbergk
rebas
e
: reorder valida
t
ion steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
ergk
rebas
e
: factor out ca
l
l to pre-
r
ebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigb
e
r
g
k
reba
s
e -i: re
m
ove now unneces
s
ary di
r
ectory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase: factor o
u
t clean work tree
check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
vo
n
Zwe
i
gbergk
rebase: factor
o
u
t
command
l
i
ne
o
ption proce
s
sing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Zweigbergk
re
b
a
s
e
:
align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e
:
align
variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Zweigbergk
rebas
e
:
stri
c
ter che
c
k of s
t
an
d
a
l
one sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
r
e
b
a
s
e: ac
t
on command li
n
e outside p
a
r
s
ing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Z
weigbergk
rebase:
improve
detection
o
f
rebase in
p
rogress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase:
remove unuse
d
rebase state 'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in
v
on Zw
e
igbergk
r
ebase: read s
t
ate
o
ut
s
ide
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gberg
k
r
e
base:
refactor reading of
s
tate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
ergk
r
ebase: cl
e
a
r
er name
s
for
di
r
ectory va
r
iab
l
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Mar
t
in von Zweigbergk
c
omplet
i
o
n
: add m
i
ssing
configurati
o
n
v
ariables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
a
rtin
von
Zweigbergk
Use r
e
flog
i
n
'
pull --
r
e
b
a
se
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigb
e
rgk
rebas
e
: only s
h
ow stat
i
f configu
r
ed to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Mart
i
n von Zwei
g
bergk
reba
s
e
--
a
bort: do not u
p
date branch
ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
ar
t
in von Zw
e
i
gbergk
rebase: s
u
ppo
r
t
--veri
f
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Marti
n
von
Z
we
i
gbergk
Docum
e
ntati
o
n/git-pull: clarify
configura
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Ma
r
t
in von Zweigbergk
rebase -X: do n
o
t clobber stra
t
e
g
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree