repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase -i: suggest using --edit-todo to fix an unknown instruction
2012-09-18
Ma
r
t
i
n von Zweigbergk
rebase usage: subcommands ca
n
not b
e
combined with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigbergk
cherry-pick/r
e
vert: res
p
e
ct order o
f
revisions to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin v
o
n
Z
weigbe
r
gk
demon
s
trate broken
'
git cherry-pick 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-walk=unsorted, which a
v
oids sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Zwe
i
gbergk
add tests for
'git
r
ebase
-
-kee
p
-empt
y
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
artin
v
on
Z
weigbergk
cherr
y
: rem
o
ve redundan
t
chec
k
for merge co
m
mit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigberg
k
cherry: don't set
i
gnored rev_inf
o
options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von
Zweigbergk
re
m
ove
unnecessary parameter f
r
o
m
get_patch_id
s
()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Mart
i
n
von Zweigbergk
add test case for reba
s
e
of empty commit
commit
|
commitdiff
|
tree
2012-06-26
Martin vo
n
Zweigberg
k
am: don't call mailinfo if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zwe
i
g
b
ergk
am -
-
rebasing: get patch bo
d
y from commi
t
,
not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigb
e
r
g
k
rebas
e
--
r
oot: prin
t
u
s
age on too many args
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigb
e
rgk
rebas
e
: don't source git-sh-setup twice
commit
|
commitdiff
|
tree
2011-12-12
M
artin von Zweigbergk
t
3401: use
test_commit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Ma
r
tin von Zwei
g
bergk
t3401: modern
i
z
e
s
t
yle
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin v
o
n Zweigbergk
am: don't p
e
rsis
t
k
e
epcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
weig
b
ergk
remote: onl
y
up
d
ate remote-track
i
ng
b
ranch
if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Zweigbergk
remote rename
:
warn
w
hen refspec was
not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
r
tin
v
on Zwei
g
bergk
remo
t
e: "r
e
name o foo" sh
o
uld not rename ref
"
origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Z
w
eig
b
ergk
remote: writ
e
c
o
rrec
t
f
e
tch
spec
when renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Zweigber
g
k
git
k
: Show
modified fi
l
es with separate w
o
rk tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweigbergk
gitk: Simp
l
ify
calculation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Z
w
eigbergk
gitk: R
u
n 'git re
v
-parse
--g
i
t-dir' on
l
y once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igbergk
gitk: P
u
t temporary directory
i
nside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in vo
n
Z
w
e
igbergk
gitk: Fix
"External diff
"
w
i
th s
e
parat
e
work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
r
ti
n
von Zweigbergk
gitk: Fix "blame parent co
m
mi
t
" with se
p
arate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igbergk
gitk: Fix "show origin of this
l
ine" with separa
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
o
n
Z
we
i
gbe
r
gk
git
k
: Fix file highlight when run in
su
b
directory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin v
o
n
Z
weigbergk
r
e
b
a
se
:
cl
a
r
i
fy "res
t
ore the o
r
iginal branch
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
M
artin von Zweigbergk
Documen
t
a
tion: use [verse] for SYNOPSIS
s
ect
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von
Z
weigbergk
d
iffcor
e
-rename: do
n
't consider unm
e
rge
d
path as
so
u
rce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Mart
i
n vo
n
Zweigbergk
rebase: define options in OPTION
S
_SPE
C
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Ma
r
tin
v
o
n
Zweigbergk
Makefile: do
not i
n
s
t
a
ll
sourced rebase s
c
ripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mart
i
n
von Zweig
b
ergk
mergetool: don't sk
i
p
modify/r
e
move confl
i
cts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Z
w
ei
g
bergk
r
erere "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zw
e
i
g
bergk
r
ebase:
us
e
@{upstream} if no
upstream speci
f
ied
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
r
ebase -i:
r
emove unnecessary
state
r
ebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zweigbergk
r
eb
a
se
-
i: don't read unused variable preserve_merge
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zw
e
ig
b
ergk
gi
t
-rebase--am:
r
e
move u
n
necessary -
-
3way optio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
rebase -m: don't
pri
n
t ex
i
t code 2 when merge
fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n Zweigbergk
rebase -m:
r
eme
m
ber a
l
lo
w
_
rerere_autoupd
a
t
e option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
reba
s
e: rememb
e
r st
r
ategy an
d
s
trat
e
gy opti
o
ns
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
r
ebase: remember verbose
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zweigbergk
r
e
base: extrac
t
code f
o
r
w
riting
b
asic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
re
b
ase: factor out su
b
co
m
mand handli
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: mak
e
-
v
a ti
n
y bit
m
ore ve
r
bose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigberg
k
rebase -i: al
i
g
n
va
r
iable n
a
mes
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
wei
g
b
e
rgk
reb
a
se: show co
n
sistent conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
r
e
base: extract am code
t
o new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
s
e
: extract merge code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweig
b
e
r
g
k
rebase: r
e
move $branc
h
as
s
ynonym fo
r
$
orig_he
a
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
i
gbergk
rebas
e
: fac
t
or out r
e
ference parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
on Zweigbergk
rebase
-i: support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zwe
i
gbergk
rebase
:
reorder validation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase: fac
t
or out ca
l
l to
p
r
e-rebase
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbe
r
gk
r
ebase -i:
remove no
w
un
n
ecessary di
r
ectory c
h
ecks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on Zweig
b
er
g
k
rebas
e
: f
a
ctor
o
u
t cl
e
a
n work tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zweigbergk
rebase: factor out command
line option p
r
o
cessing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: a
l
ign variab
l
e conte
n
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
r
eb
a
se: align va
r
iab
l
e
nam
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
reba
s
e: st
r
icter check of sta
n
da
l
one s
u
b command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigberg
k
r
e
ba
s
e: act on co
m
mand line out
s
id
e
parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Z
w
eig
b
ergk
reb
a
se: improve
detection
o
f
rebase in progre
s
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbe
r
gk
r
eba
s
e: remove unused
rebase state
'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
reba
s
e: read state outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebas
e
: refactor reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Z
w
eigbe
r
gk
rebase: clearer
n
ames for directory v
a
r
i
a
bles
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zweigber
g
k
completion: add missing configuration v
a
riables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
tin von Zweigbergk
Use ref
l
og in 'pu
l
l --r
e
base
.
fo
o
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
rebase: o
n
ly
s
how stat if c
o
nfigured
to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Z
w
eigbe
r
g
k
r
ebase --
a
b
o
rt: do not upd
a
t
e
branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zw
e
igbergk
rebase: s
u
pport --veri
f
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von
Zwei
g
berg
k
Documentat
i
on/g
i
t-pull
:
clarify configu
r
a
tio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
a
rt
i
n von Zweigbergk
re
b
ase -X:
do
n
ot c
l
obb
e
r strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree