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
Split over-long synopsis in git-fetch-pack.txt into several lines
2012-09-18
Martin
von Z
w
eigbergk
rebase usage: subcomm
a
nds can not be combined with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin
v
on Zwei
g
bergk
cher
r
y-p
i
ck/reve
r
t: respect order of r
e
vision
s
t
o
pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mart
i
n vo
n
Zweigber
g
k
dem
o
nstrate broken 'git c
h
erry-pick
t
hree
one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mar
t
in
v
on Zweigbergk
t
e
a
c
h
log --no-walk=uns
o
r
t
ed, which av
o
i
d
s sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Zweigber
g
k
add
t
ests for
'
git rebase --keep-emp
t
y'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigbergk
cherry: remove redunda
n
t
che
c
k
for merge commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Mar
t
in von
Z
weigbergk
c
h
e
rry:
don't set ignored
r
ev_info optio
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
M
a
r
tin
von
Z
wei
g
bergk
rem
o
ve unneces
s
ary param
e
ter from get_patc
h
_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Ma
r
ti
n
von Zweigbergk
add test
c
a
s
e
fo
r
rebas
e
of e
m
p
ty commit
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin vo
n
Z
weigberg
k
am:
d
on't cal
l
maili
n
f
o
if $reba
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigber
g
k
am --rebasing
:
get patch body from comm
i
t
,
not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zwei
g
bergk
r
e
ba
s
e
--root: print usage on too m
a
n
y args
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
rebase: don't source
gi
t
-sh-setup twice
commit
|
commitdiff
|
tree
2011-12-12
Mar
t
in v
o
n
Zwei
g
bergk
t3401: us
e
test_commit i
n
setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
M
a
rti
n
von Zweig
b
ergk
t3401: modernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Ma
r
tin von
Zweig
b
er
g
k
am: don't persist keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
on Zwe
i
gbergk
re
m
ote: only update
remote-tracking bra
n
ch if updatin
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin v
o
n Zwei
g
ber
g
k
remote
r
ena
m
e: wa
r
n when
r
efspec was
n
o
t
u
p
d
a
ted
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zw
e
igbergk
remot
e
: "re
n
a
me o foo" should
n
o
t
rename 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 whe
n
r
e
n
aming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigberg
k
git
k
: Show modified fi
l
es with separate
w
ork
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Simp
l
ify
c
a
l
culation
of
g
itdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
ig
b
ergk
gitk: Run 'git rev-pa
r
se --git-
d
ir'
only o
n
ce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zwei
g
b
e
r
g
k
gitk: Put temporar
y
director
y
inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
vo
n
Zweigbergk
gitk: Fi
x
"Exter
n
al diff" wit
h
se
p
a
ra
t
e
w
ork
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n
v
on
Z
weigbergk
gitk: Fi
x
"blam
e
parent
c
ommit
"
with separate
work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
o
n
Z
weigbergk
gitk: F
i
x
"sh
o
w origin of this line" with separat
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
g
itk
:
F
i
x
f
i
l
e
highlight when
r
un in
s
ubd
i
rectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von
Zweigbergk
r
e
base: c
l
arify "restore the
o
r
i
ginal bran
c
h
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von
Z
weigbergk
Doc
u
mentation: u
s
e [verse] for SYNO
P
SIS se
c
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin
v
on Zweigbergk
diff
c
or
e
-
rename:
d
on'
t
con
s
i
der
unmerged path
a
s
sou
r
ce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Mar
t
in von Zweigbergk
r
e
b
ase:
de
f
ine options in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Mar
t
in von Zweigbergk
Makefi
l
e
: do not install sourced rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
artin
v
on Zweigbergk
mergetool: don't sk
i
p modify/remo
v
e con
f
licts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
von Zweigber
g
k
r
e
rere "rema
i
ning
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Zweigberg
k
r
e
base:
use @
{
up
s
t
ream} if
n
o upstream spe
c
ified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
se -i: remove unnece
s
sary sta
t
e reb
a
se-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zw
e
igbergk
re
b
ase -
i
: don't read unused
variab
l
e
p
rese
r
v
e
_me
r
ges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
git-rebase-
-
am: r
e
move
u
nne
c
essary
--3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase -m: don't prin
t
e
x
it co
d
e 2 when merg
e
fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
we
i
g
bergk
rebase -m: rememb
e
r allow_rerere_aut
o
u
p
date option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
von Z
w
eigbergk
re
b
ase: remember
s
t
rategy and strateg
y
o
ptions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
re
b
ase
:
r
e
member
v
erbos
e
opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Zweigbergk
r
ebase: extrac
t
code for wr
i
ting basic
s
tate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase
:
factor out
sub c
o
mmand h
a
ndling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
reb
a
s
e:
make -v a tiny bit more
v
er
b
o
s
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Zwe
i
gbergk
rebase -i:
a
lign variab
l
e na
m
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: show consis
t
ent conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigb
e
rgk
rebase: ext
r
act am co
d
e to new source
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweig
b
e
rgk
reb
a
s
e:
extract
merge code t
o
new sou
r
ce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zwe
i
gbergk
re
b
ase
:
remove
$
br
a
n
c
h
a
s
synonym for $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
on Zweigbergk
rebase: fact
o
r out r
e
ference
parsi
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zwe
i
gbergk
rebase -i: su
p
port --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
weigbe
r
gk
rebas
e
: reorder validatio
n
steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigber
g
k
rebase: fac
t
or out
call to p
r
e-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zwe
i
gbergk
rebase -i: r
e
move no
w
unnecessary d
i
rector
y
che
c
ks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zw
e
igbergk
reb
a
se: 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
a
rtin von Zweigbergk
rebase: factor out
c
ommand
l
in
e
option proc
e
ssing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwei
g
be
r
gk
re
b
ase: alig
n
variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
r
e
base: align
v
aria
b
le names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
weigbe
r
gk
r
e
base: stricter
che
c
k
o
f standalon
e
sub co
m
ma
n
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in vo
n
Zweigbergk
rebase: act on command line
outside
p
arsin
g
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von Zw
e
igbergk
r
e
b
as
e
: improve
d
etection of
r
ebase in
p
r
o
gress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase:
remove
u
nuse
d
rebase state
'
p
r
ev_head
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
r
e
b
ase:
re
a
d s
t
at
e
ou
t
side l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbe
r
gk
rebas
e
: refactor reading of st
a
t
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Z
w
eigbergk
r
e
b
ase: clearer name
s
fo
r
d
i
r
e
ctory
va
r
ia
b
l
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
M
a
rtin v
o
n Zweigbergk
c
o
mpletion
:
add missing configuration variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
a
r
t
i
n von Z
w
eigbergk
U
s
e reflog in 'pu
l
l --rebase
.
f
oo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mar
t
in
v
on Z
w
e
igbergk
rebas
e
:
only
s
h
ow stat
i
f
configur
e
d to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zw
e
igber
g
k
r
ebase
-
-abor
t
: do not u
p
date
bra
n
c
h ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Marti
n
v
on Zweigbergk
rebase: support --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
artin von
Z
weigbergk
Documentati
o
n/git
-
pull: clarify c
o
nfi
g
u
ration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Mar
t
in
v
on Zweigbe
r
gk
rebase -X: do not clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree