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
Documentation: filter-branch env-filter example
2012-08-30
Marti
n
vo
n
Zweigbergk
cherr
y
-pick/revert:
respect order of revisions to pic
k
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von
Z
wei
g
ber
g
k
demo
n
strate broken
'gi
t
cherry-
p
ick three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Ma
r
tin von Zweigbergk
teach log --n
o
-
w
alk
=
u
nsorted,
whic
h
avoids s
o
rting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Marti
n
von
Z
weigberg
k
add tests
f
or 'git reba
s
e --ke
e
p-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin v
o
n
Zweigbergk
ad
d
t
est case for reba
s
e o
f
empty commit
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zwe
i
gbergk
am: don
'
t call
mailinfo i
f
$re
b
asing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mar
t
in
v
on
Z
weigber
g
k
a
m
--rebasing: g
e
t
p
a
t
ch body from commit, not
f
rom
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
artin von
Z
weigb
e
rg
k
rebase
--root: print us
a
ge on too many arg
s
commit
|
commitdiff
|
tree
2012-06-26
Martin von
Z
w
e
igbergk
rebase: don't sou
r
ce git-
s
h
-
s
et
u
p
twice
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zw
e
igbergk
t3401: use t
e
s
t_
c
omm
i
t in set
u
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
M
a
rtin vo
n
Zw
e
igbergk
t
3
401: m
o
der
n
i
z
e style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Mart
i
n von Zweigb
e
rgk
am: d
o
n'
t
p
ersist
k
eepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in von
Zw
e
igber
g
k
remote: only update r
e
mot
e
-tracking
branch if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rtin von
Z
weigbergk
remote rename: warn
when
r
efspec
w
as not
u
pdated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote: "ren
a
me o f
o
o" should no
t
r
e
name ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
arti
n
von
Zwe
i
gbergk
remote: wr
i
t
e co
r
rect fetch
spec when
rena
m
ing remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Show
mo
d
ifi
e
d f
i
les with separate work
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweigber
g
k
gitk
:
Simplify c
a
lculation
of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in
von
Z
w
eigbergk
gitk: Run 'gi
t
rev
-
parse --g
i
t
-
dir' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwe
i
gbergk
gitk: Pu
t
te
m
p
or
a
ry dire
c
tory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
r
t
i
n
von Z
w
eigbergk
gitk: Fix "Externa
l
diff" w
i
th
s
eparate wor
k
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n
Zweigbe
r
g
k
gitk: Fix "bla
m
e parent
commit" with
s
epar
a
te work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zwe
i
gber
g
k
gi
t
k
:
F
i
x
"show origin of this line" wit
h
separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
i
gbergk
gitk: Fix file h
i
ghlight when run
i
n
s
ubd
i
rectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin
v
on Zweigbergk
r
e
base:
c
larify "restore the original br
a
nch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Ma
r
tin von Zweigbe
r
g
k
Docume
n
t
a
tion: use [
v
erse] for SYNOPSIS se
c
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von
Z
weig
b
ergk
diffcor
e
-rename: don't c
o
ns
i
der unm
e
rged path a
s
sour
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zweigbe
r
gk
rebase: defi
n
e
optio
n
s in OPTIONS_
S
PEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Mart
i
n v
o
n Zweigbergk
Makefi
l
e:
do no
t
install
s
ourced rebase scr
i
p
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
v
on Zweigbe
r
gk
mer
g
etool: d
o
n't skip mod
i
fy/re
m
ove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
artin von
Zweigber
g
k
rerere "remaini
n
g"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: use @{up
s
tream
}
if no upstream specifie
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase
-i: remove
unnecessary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Z
weigb
e
rgk
rebas
e
-i: don't
read u
n
used variab
l
e preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
g
i
t
-rebase--am: remove
u
n
nece
s
sary --3way op
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
r
ebase
-m: don'
t
p
r
int exit c
o
de 2 whe
n
m
e
rge fa
i
ls
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Z
w
eigbergk
rebas
e
-
m
: remember
allow_rerere_autoupdate
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
v
o
n
Z
weigbergk
rebase:
rememb
e
r s
t
ra
t
e
gy and strategy opt
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
eigb
e
rgk
rebase: r
e
member ver
b
ose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigberg
k
rebase
:
extract code for
writin
g
ba
s
ic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbe
r
gk
rebase: factor out sub command ha
n
dli
n
g
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 verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase -
i
:
a
lign var
i
abl
e
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
r
ebase: show con
s
istent confl
i
ct resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
re
b
ase: e
x
tract a
m
code to new s
o
urce
fil
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Z
w
eig
b
e
rgk
rebase:
e
xtr
a
ct merg
e
code
to new
sou
r
ce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweig
b
e
rgk
r
e
b
a
s
e: remove $b
r
anch
as synonym for $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zwe
i
gberg
k
rebase: fac
t
o
r
out reference
parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweig
b
e
rgk
rebase
-
i:
support -
-
st
a
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n
v
on Zw
e
igbergk
rebase: reorder valid
a
tio
n
step
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von Zweigbergk
reb
a
se
:
fa
c
t
or out call to pre-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbe
r
g
k
reb
a
se -i: r
e
move no
w
u
nnecessary directory
checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von
Zweigberg
k
rebase:
factor out cle
a
n
work tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase: factor out c
o
mmand line
option processi
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
erg
k
rebase: align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweig
b
e
r
gk
rebase:
align
v
a
riable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
re
b
as
e
: strict
e
r chec
k
of sta
n
da
l
one sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
rebase: act on command line outs
i
de parsing
l
o
o
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zw
e
igbergk
reba
s
e: improv
e
de
t
e
c
tion
of rebase
i
n progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
re
b
ase:
remo
v
e unused rebase state 'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Z
w
eigber
g
k
rebase: read state outs
i
de
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von Z
w
eigbergk
r
ebase: refactor readi
n
g
o
f
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwe
i
gbergk
rebase
:
clearer n
a
m
es for directo
r
y variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
M
a
rtin von Z
w
e
igberg
k
completio
n
: add missing co
n
figuration variable
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin vo
n
Zw
e
i
gbergk
Use
r
e
f
log in 'pull --
r
e
b
ase
.
fo
o
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
artin
von Zweigbergk
r
e
b
a
se
:
only show stat
i
f
configured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Ma
r
t
i
n von Zweigbergk
rebase
-
-abort: do not u
p
date branch re
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von
Z
we
i
gbergk
rebase: sup
p
o
rt --veri
f
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
artin von Z
w
eigb
e
r
gk
Documentatio
n
/git-pull: c
l
arify con
f
ig
u
rati
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von
Zwei
g
bergk
reb
a
se -X: do
n
o
t
c
lobber str
a
t
egy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree