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
mergetool--lib: don't call "exit" in setup_tool
2012-09-18
Martin
v
on Z
w
eigbergk
rebase u
s
age:
s
ubcommands
can not
b
e
combined with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigb
e
rgk
cherr
y
-pick/revert: respect order of revisi
o
ns to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mart
i
n
von
Zweigber
g
k
demonst
r
ate broken 'gi
t
ch
e
rry-pick
t
hree one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mart
i
n von Zweigbergk
teach log --no
-
walk=unsor
t
ed, which
avoids sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin
v
on Zwe
i
g
b
ergk
add
t
ests for 'git reb
a
s
e
--k
e
ep
-
empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
artin
v
on Zw
e
i
g
bergk
c
h
e
rry: rem
o
ve redundant c
h
eck for merg
e
c
ommit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Ma
r
t
i
n vo
n
Z
w
eigb
e
r
gk
cherry: don't
s
et ignored rev_inf
o
option
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
M
art
i
n von Zwei
g
bergk
remove unnecessary parameter
from get_patch
_
ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin
v
o
n Zwei
g
b
ergk
add test case
f
o
r
r
e
b
ase of empty co
m
m
i
t
commit
|
commitdiff
|
tree
2012-06-26
M
artin von
Z
we
i
gbe
r
gk
am: don
'
t call mailinf
o
if
$re
b
asing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
artin von Zweigb
e
rgk
am --rebasing:
g
et
p
atch body fr
o
m commit
,
not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin
v
o
n
Zw
e
i
gber
g
k
rebase --root: print usage on too many arg
s
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n von Zweigbe
r
gk
rebase
:
don't s
o
urce git
-
sh-setup twice
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweig
b
er
g
k
t3401:
u
se tes
t
_co
m
mit in se
t
up
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Mar
t
in von Zwe
i
g
b
erg
k
t
3
401: modernize sty
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Mart
i
n von Zw
e
i
g
bergk
am
:
don't persi
s
t keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
ar
t
i
n
von Zweigber
g
k
re
m
ote: onl
y
update
r
emote-
t
ra
c
ki
n
g
b
ran
c
h if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rtin von Zweigbergk
remo
t
e rename:
w
arn w
h
en
r
e
f
spec was not
updat
e
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote: "rename o foo
"
should not renam
e
ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin von Zweigber
g
k
remote: write corr
e
ct
f
etch sp
e
c w
h
e
n
renaming remot
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von
Z
wei
g
bergk
g
itk:
Sh
o
w modified files
w
ith separate
w
ork tr
e
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk
:
Simplify ca
l
culation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk
:
R
u
n
'git rev-
p
arse --git-dir' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
art
i
n vo
n
Zweigbergk
gitk:
Put temporary directo
r
y in
s
ide
.
g
i
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Zweigbergk
g
i
t
k
: Fix "External diff" with se
p
arate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zwe
i
gbergk
g
itk: Fix "b
l
a
me pa
r
ent
commit" wit
h
s
eparate
work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zweigbergk
g
i
tk:
F
ix
"s
h
ow or
i
gin of
t
his
line" wit
h
separ
a
te
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n
von Zweigbergk
g
itk: Fix
f
i
l
e highli
g
ht when run in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Marti
n
v
o
n
Z
weigbergk
reb
a
se
:
clarif
y
"restore the original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Z
w
eigbe
r
gk
Documentation: use [verse] for SYN
O
PSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von
Z
weigbergk
diffcore-
r
ename: don't c
o
nsider un
m
e
r
ged path
as sour
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Mar
t
in vo
n
Zweig
b
er
g
k
rebase: def
i
ne options in OPT
I
ONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin
v
o
n Zweigbergk
Makefile: do not instal
l
sourced rebase scr
i
pts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Ma
r
tin vo
n
Zw
e
igberg
k
m
e
rgetool: don't skip modify/remov
e
conf
l
icts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Marti
n
von Zwe
i
gbergk
r
erere
"
r
e
m
a
ining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
i
g
bergk
rebase: use @{upstr
e
a
m} if
n
o upstream sp
e
cified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Z
w
eigbergk
rebase
-
i: rem
o
v
e
unnecessary
state rebas
e
-r
o
ot
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: don't re
a
d
un
u
s
ed
variable prese
r
v
e
_m
e
r
g
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
vo
n
Zweigberg
k
git-rebase
-
-am: remove unnec
e
ssary --3way op
t
io
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Zweig
b
e
r
g
k
r
ebase -m: don't print
e
xit code
2
w
h
en
merge
f
ails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase -m: remember allow_rer
e
re_autoupda
t
e
o
ptio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigb
e
rgk
rebase: rem
e
mb
e
r strategy a
n
d strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigbergk
rebase: remember verbose optio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
e
x
tract
code for
w
ritin
g
ba
s
ic
s
tat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
on
Zweigbergk
re
b
ase:
factor out sub command handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zweigbe
r
g
k
r
e
b
a
se
:
m
a
ke -v a tiny
bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
b
ase -i: ali
g
n va
r
iable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in v
o
n Zweigbergk
rebase
:
show con
s
ist
e
n
t
c
o
n
flict resoluti
o
n hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zweigb
e
rgk
rebase:
extract am code
t
o
n
ew sourc
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbe
r
g
k
re
b
ase: e
x
tract merg
e
code to ne
w
so
u
r
c
e file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: remove $branc
h
as
synonym for $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n von
Z
weigbe
r
gk
reb
a
se: factor out
r
efer
e
nce pars
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von Zwei
g
bergk
rebase -i: support
-
-stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Z
w
eigberg
k
reb
a
se: reorder
validatio
n
steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase
:
factor
o
ut ca
l
l to pre-reb
a
se
h
oo
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
re
b
ase -i: remove now unn
e
cessary d
i
re
c
tory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: factor
o
u
t
clean work tree che
c
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
re
b
ase: factor out co
m
mand lin
e
option
p
roce
s
sing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Z
w
eigb
e
rg
k
rebas
e
: a
l
ign variable
co
n
tent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
se: alig
n
variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base:
s
tricter che
c
k of stan
d
alon
e
sub co
m
ma
n
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebas
e
:
act
on
c
ommand lin
e
outsi
d
e
parsing
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigberg
k
rebase: imp
r
ove
d
etection
o
f reb
a
se in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin vo
n
Zweigbe
r
gk
r
e
base: remove u
n
used rebase state
'
prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: read stat
e
outsid
e
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n Zweigbergk
rebase: refactor reading of
s
t
a
t
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zweig
b
ergk
rebase:
c
lea
r
e
r
name
s
for dire
c
t
o
ry variable
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Ma
r
tin von Z
w
eigb
e
r
g
k
c
o
mpletion: a
d
d
missing confi
g
ura
t
ion variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mar
t
in
von Zweigber
g
k
U
s
e
reflog i
n
'pull -
-
rebase
.
fo
o
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
rebase: only show stat
i
f con
f
i
gured to
t
r
ue
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Ma
r
tin von Zwe
i
gb
e
r
gk
reb
a
se --abo
r
t: do not up
d
ate branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Ma
r
t
i
n von
Z
weigbergk
rebase
:
support --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Marti
n
von Zweigbergk
Documenta
t
ion/git-pull: clarify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Ma
r
tin von Zweigbergk
re
b
a
s
e -X: do
not
c
lo
b
ber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree